From f336e5c3ae7f8fd7c47892c1f466074386dc0cca Mon Sep 17 00:00:00 2001 From: Valk Richard Li <48872266+ValKmjolnir@users.noreply.github.com> Date: Mon, 30 Nov 2020 23:54:32 +0800 Subject: [PATCH] update --- nasal.h | 1 - nasal_ast.h | 87 +++++++++++++++++++++++++++++++++++ nasal_builtin.h | 2 +- nasal_enum.h | 118 ------------------------------------------------ nasal_gc.h | 11 +++++ nasal_lexer.h | 17 +++++++ 6 files changed, 116 insertions(+), 120 deletions(-) delete mode 100644 nasal_enum.h diff --git a/nasal.h b/nasal.h index c010d4b..f8c9189 100644 --- a/nasal.h +++ b/nasal.h @@ -18,7 +18,6 @@ #include #include -#include "nasal_enum.h" #include "nasal_misc.h" #include "nasal_lexer.h" #include "nasal_ast.h" diff --git a/nasal_ast.h b/nasal_ast.h index 8c3a45c..8d175c7 100644 --- a/nasal_ast.h +++ b/nasal_ast.h @@ -1,6 +1,93 @@ #ifndef __NASAL_AST_H__ #define __NASAL_AST_H__ +enum ast_node +{ + ast_null=0,ast_root,ast_block, + ast_nil,ast_number,ast_string,ast_identifier,ast_function,ast_hash,ast_vector, + ast_hashmember,ast_call,ast_call_hash,ast_call_vec,ast_call_func,ast_subvec, + ast_args,ast_default_arg,ast_dynamic_id, + ast_and,ast_or, + ast_equal,ast_add_equal,ast_sub_equal,ast_mult_equal,ast_div_equal,ast_link_equal, + ast_cmp_equal,ast_cmp_not_equal, + ast_less_than,ast_less_equal, + ast_greater_than,ast_greater_equal, + ast_add,ast_sub,ast_mult,ast_div,ast_link, + ast_unary_sub,ast_unary_not, + ast_trinocular, + ast_for,ast_forindex,ast_foreach,ast_while,ast_new_iter, + ast_conditional,ast_if,ast_elsif,ast_else, + ast_multi_id,ast_multi_scalar, + ast_definition,ast_multi_assign, + ast_continue,ast_break,ast_return +}; + +std::string ast_str(int type) +{ + std::string str; + switch(type) + { + case ast_null: str="null";break; + case ast_root: str="root";break; + case ast_block: str="block";break; + case ast_nil: str="nil";break; + case ast_number: str="number";break; + case ast_string: str="string";break; + case ast_identifier: str="id";break; + case ast_function: str="function";break; + case ast_hash: str="hash";break; + case ast_vector: str="vector";break; + case ast_hashmember: str="hashmember";break; + case ast_call: str="call";break; + case ast_call_hash: str="call_hash";break; + case ast_call_vec: str="call_vector";break; + case ast_call_func: str="call_func";break; + case ast_subvec: str="subvec";break; + case ast_args: str="arguments";break; + case ast_default_arg: str="default_arg";break; + case ast_dynamic_id: str="dynamic_id";break; + case ast_and: str="and";break; + case ast_or: str="or";break; + case ast_equal: str="=";break; + case ast_add_equal: str="+=";break; + case ast_sub_equal: str="-=";break; + case ast_mult_equal: str="*=";break; + case ast_div_equal: str="/=";break; + case ast_link_equal: str="~=";break; + case ast_cmp_equal: str="==";break; + case ast_cmp_not_equal:str="!=";break; + case ast_less_than: str="<";break; + case ast_less_equal: str="<=";break; + case ast_greater_than: str=">";break; + case ast_greater_equal:str=">=";break; + case ast_add: str="+";break; + case ast_sub: str="-";break; + case ast_mult: str="*";break; + case ast_div: str="/";break; + case ast_link: str="~";break; + case ast_unary_sub: str="unary-";break; + case ast_unary_not: str="unary!";break; + case ast_trinocular: str="trinocular";break; + case ast_for: str="for";break; + case ast_forindex: str="forindex";break; + case ast_foreach: str="foreach";break; + case ast_while: str="while";break; + case ast_new_iter: str="new_iterator";break; + case ast_conditional: str="conditional";break; + case ast_if: str="if";break; + case ast_elsif: str="elsif";break; + case ast_else: str="else";break; + case ast_multi_id: str="multi_id";break; + case ast_multi_scalar: str="multi_scalar";break; + case ast_definition: str="definition";break; + case ast_multi_assign: str="multi_assignment";break; + case ast_continue: str="continue";break; + case ast_break: str="break";break; + case ast_return: str="return";break; + } + return str; +} + class nasal_ast { private: diff --git a/nasal_builtin.h b/nasal_builtin.h index 03b17e4..b92862b 100644 --- a/nasal_builtin.h +++ b/nasal_builtin.h @@ -51,7 +51,7 @@ int builtin_contains(int); int builtin_delete(int); int builtin_getkeys(int); int builtin_import(int); -int builtin_die_state; +int builtin_die_state;// used in builtin_die int builtin_die(int); int builtin_type(int); int builtin_substr(int); diff --git a/nasal_enum.h b/nasal_enum.h deleted file mode 100644 index d2b5345..0000000 --- a/nasal_enum.h +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef __NASAL_ENUM_H__ -#define __NASAL_ENUM_H__ - -/* token_type is used in lexer */ -enum token_type -{ - tok_null=0, - tok_number,tok_string,tok_identifier, - tok_for,tok_forindex,tok_foreach,tok_while, - tok_var,tok_func,tok_break,tok_continue, - tok_return,tok_if,tok_elsif,tok_else,tok_nil, - tok_left_curve,tok_right_curve, - tok_left_bracket,tok_right_bracket, - tok_left_brace,tok_right_brace, - tok_semi,tok_and,tok_or,tok_comma,tok_dot,tok_ellipsis,tok_quesmark, - tok_colon,tok_add,tok_sub,tok_mult,tok_div,tok_link,tok_not, - tok_equal, - tok_add_equal,tok_sub_equal,tok_mult_equal,tok_div_equal,tok_link_equal, - tok_cmp_equal,tok_cmp_not_equal,tok_less_than,tok_greater_than,tok_less_equal,tok_greater_equal -}; - -enum ast_node -{ - ast_null=0,ast_root,ast_block, - ast_nil,ast_number,ast_string,ast_identifier,ast_function,ast_hash,ast_vector, - ast_hashmember,ast_call,ast_call_hash,ast_call_vec,ast_call_func,ast_subvec, - ast_args,ast_default_arg,ast_dynamic_id, - ast_and,ast_or, - ast_equal,ast_add_equal,ast_sub_equal,ast_mult_equal,ast_div_equal,ast_link_equal, - ast_cmp_equal,ast_cmp_not_equal,ast_less_than,ast_less_equal,ast_greater_than,ast_greater_equal, - ast_add,ast_sub,ast_mult,ast_div,ast_link, - ast_unary_sub,ast_unary_not, - ast_trinocular, - ast_for,ast_forindex,ast_foreach,ast_while,ast_new_iter, - ast_conditional,ast_if,ast_elsif,ast_else, - ast_multi_id,ast_multi_scalar, - ast_definition,ast_multi_assign, - ast_continue,ast_break,ast_return -}; - -std::string ast_str(int type) -{ - std::string str; - switch(type) - { - case ast_null: str="null";break; - case ast_root: str="root";break; - case ast_block: str="block";break; - case ast_nil: str="nil";break; - case ast_number: str="number";break; - case ast_string: str="string";break; - case ast_identifier: str="id";break; - case ast_function: str="function";break; - case ast_hash: str="hash";break; - case ast_vector: str="vector";break; - case ast_hashmember: str="hashmember";break; - case ast_call: str="call";break; - case ast_call_hash: str="call_hash";break; - case ast_call_vec: str="call_vector";break; - case ast_call_func: str="call_func";break; - case ast_subvec: str="subvec";break; - case ast_args: str="arguments";break; - case ast_default_arg: str="default_arg";break; - case ast_dynamic_id: str="dynamic_id";break; - case ast_and: str="and";break; - case ast_or: str="or";break; - case ast_equal: str="=";break; - case ast_add_equal: str="+=";break; - case ast_sub_equal: str="-=";break; - case ast_mult_equal: str="*=";break; - case ast_div_equal: str="/=";break; - case ast_link_equal: str="~=";break; - case ast_cmp_equal: str="==";break; - case ast_cmp_not_equal:str="!=";break; - case ast_less_than: str="<";break; - case ast_less_equal: str="<=";break; - case ast_greater_than: str=">";break; - case ast_greater_equal:str=">=";break; - case ast_add: str="+";break; - case ast_sub: str="-";break; - case ast_mult: str="*";break; - case ast_div: str="/";break; - case ast_link: str="~";break; - case ast_unary_sub: str="unary-";break; - case ast_unary_not: str="unary!";break; - case ast_trinocular: str="trinocular";break; - case ast_for: str="for";break; - case ast_forindex: str="forindex";break; - case ast_foreach: str="foreach";break; - case ast_while: str="while";break; - case ast_new_iter: str="new_iterator";break; - case ast_conditional: str="conditional";break; - case ast_if: str="if";break; - case ast_elsif: str="elsif";break; - case ast_else: str="else";break; - case ast_multi_id: str="multi_id";break; - case ast_multi_scalar: str="multi_scalar";break; - case ast_definition: str="definition";break; - case ast_multi_assign: str="multi_assignment";break; - case ast_continue: str="continue";break; - case ast_break: str="break";break; - case ast_return: str="return";break; - } - return str; -} - -enum runtime_scalar_type -{ - vm_nil=0, - vm_number, - vm_string, - vm_closure, - vm_function, - vm_vector, - vm_hash -}; - -#endif \ No newline at end of file diff --git a/nasal_gc.h b/nasal_gc.h index 510c866..5ccdcbf 100644 --- a/nasal_gc.h +++ b/nasal_gc.h @@ -1,6 +1,17 @@ #ifndef __NASAL_GC_H__ #define __NASAL_GC_H__ +enum runtime_scalar_type +{ + vm_nil=0, + vm_number, + vm_string, + vm_closure, + vm_function, + vm_vector, + vm_hash +}; + #define MEM_BLK_SIZE 256 // 0x00 ~ 0xff #define GC_BLK_SIZE 256 // 0x00 ~ 0xff /* diff --git a/nasal_lexer.h b/nasal_lexer.h index 5698506..96ca37d 100644 --- a/nasal_lexer.h +++ b/nasal_lexer.h @@ -13,6 +13,23 @@ #define IS_CALC_OPERATOR(c) (c=='='||c=='+'||c=='-'||c=='*'||c=='!'||c=='/'||c=='<'||c=='>'||c=='~') #define IS_NOTE(c) (c=='#') +enum token_type +{ + tok_null=0, + tok_number,tok_string,tok_identifier, + tok_for,tok_forindex,tok_foreach,tok_while, + tok_var,tok_func,tok_break,tok_continue, + tok_return,tok_if,tok_elsif,tok_else,tok_nil, + tok_left_curve,tok_right_curve, + tok_left_bracket,tok_right_bracket, + tok_left_brace,tok_right_brace, + tok_semi,tok_and,tok_or,tok_comma,tok_dot,tok_ellipsis,tok_quesmark, + tok_colon,tok_add,tok_sub,tok_mult,tok_div,tok_link,tok_not, + tok_equal, + tok_add_equal,tok_sub_equal,tok_mult_equal,tok_div_equal,tok_link_equal, + tok_cmp_equal,tok_cmp_not_equal,tok_less_than,tok_greater_than,tok_less_equal,tok_greater_equal +}; + struct { const char* str;