aboutsummaryrefslogtreecommitdiff
path: root/core/io/json.h
diff options
context:
space:
mode:
authorRémi Verschelde2017-03-05 16:44:50 +0100
committerRémi Verschelde2017-03-05 16:44:50 +0100
commit5dbf1809c6e3e905b94b8764e99491e608122261 (patch)
tree5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /core/io/json.h
parent45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff)
downloadgodot-5dbf180.tar.gz
godot-5dbf180.tar.zst
godot-5dbf180.zip
A Whole New World (clang-format edition)
I can show you the code Pretty, with proper whitespace Tell me, coder, now when did You last write readable code? I can open your eyes Make you see your bad indent Force you to respect the style The core devs agreed upon A whole new world A new fantastic code format A de facto standard With some sugar Enforced with clang-format A whole new world A dazzling style we all dreamed of And when we read it through It's crystal clear That now we're in a whole new world of code
Diffstat (limited to 'core/io/json.h')
-rw-r--r--core/io/json.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/core/io/json.h b/core/io/json.h
index 97457d223..afd97c85b 100644
--- a/core/io/json.h
+++ b/core/io/json.h
@@ -29,11 +29,8 @@
#ifndef JSON_H
#define JSON_H
-
-
#include "variant.h"
-
class JSON {
enum TokenType {
@@ -64,18 +61,18 @@ class JSON {
Variant value;
};
- static const char * tk_name[TK_MAX];
+ static const char *tk_name[TK_MAX];
- static String _print_var(const Variant& p_var);
+ static String _print_var(const Variant &p_var);
- static Error _get_token(const CharType *p_str,int &index, int p_len,Token& r_token,int &line,String &r_err_str);
- static Error _parse_value(Variant &value,Token& token,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str);
- static Error _parse_array(Array &array,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str);
- static Error _parse_object(Dictionary &object,const CharType *p_str,int &index, int p_len,int &line,String &r_err_str);
+ static Error _get_token(const CharType *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str);
+ static Error _parse_value(Variant &value, Token &token, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str);
+ static Error _parse_array(Array &array, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str);
+ static Error _parse_object(Dictionary &object, const CharType *p_str, int &index, int p_len, int &line, String &r_err_str);
public:
static String print(const Variant &p_var);
- static Error parse(const String& p_json,Variant& r_ret,String &r_err_str,int &r_err_line);
+ static Error parse(const String &p_json, Variant &r_ret, String &r_err_str, int &r_err_line);
};
#endif // JSON_H