Rename T_VAR to T_ID to better reflect it's usage

diff --git a/source/sclpl/codegen.c b/source/sclpl/codegen.c
index 4331862b13eb68a3b2bef69f7ba8ea305a75fdc3..dbc66cff48ffdf1fd59039cac0b29129e16def2d 100644 (file)
--- a/source/sclpl/codegen.c
+++ b/source/sclpl/codegen.c
@@ -34,7 +34,7 @@ static bool is_formtype(tree_t* p_tree, const char* val) {
     tree_t* child = get_child(p_tree, 0);
     if ((NULL != child) && (child->tag == ATOM)) {
         lex_tok_t* token = child->ptr.tok;
-        if ((token->type == T_VAR) &&
+        if ((token->type == T_ID) &&
             (0 == strcmp(val, (char*)token->value))) {
             ret = true;
         }
@@ -146,7 +146,7 @@ static void emit_expression(FILE* file, vec_t* fnlst, tree_t* p_tree, int depth)
             case T_INT:    fprintf(file, "__int(%ld)",  *((long int*)tok->value));              break;
             case T_FLOAT:  fprintf(file, "__float(%f)", *((double*)tok->value));                break;
             case T_BOOL:   fprintf(file, "__bool(%s)",  ((intptr_t)tok->value)?"true":"false"); break;
-            case T_VAR:    fprintf(file, "%s",          ((char*)tok->value));                   break;
+            case T_ID:     fprintf(file, "%s",          ((char*)tok->value));                   break;
             default:                                                                            break;
         }
     } else if (is_formtype(p_tree, "if")) {

diff --git a/source/sclpl/grammar.c b/source/sclpl/grammar.c
index 40b9502f8b408602e925d5ca63eed4b1c6b7a06f..9436e0ff985465c8b3c2a0b1895612686160c5bf 100644 (file)
--- a/source/sclpl/grammar.c
+++ b/source/sclpl/grammar.c
@@ -12,9 +12,9 @@ tree_t* grammar_toplevel(parser_t* p_parser)
 {
     tree_t* p_tree = NULL;
     try {
-        if (parser_accept_str(p_parser, T_VAR, "require"))
+        if (parser_accept_str(p_parser, T_ID, "require"))
             grammar_require(p_parser);
-        else if (parser_accept_str(p_parser, T_VAR, "def"))
+        else if (parser_accept_str(p_parser, T_ID, "def"))
             grammar_definition(p_parser);
         else
             grammar_expression(p_parser);
@@ -36,9 +36,9 @@ void grammar_require(parser_t* p_parser)
 void grammar_definition(parser_t* p_parser)
 {
     size_t mark = parser_mark(p_parser);
-    parser_expect(p_parser,T_VAR);
+    parser_expect(p_parser,T_ID);
     if (parser_peek(p_parser)->type == T_LPAR) {
-        parser_insert(p_parser, T_VAR, lexer_dup("fn"));
+        parser_insert(p_parser, T_ID, lexer_dup("fn"));
         grammar_fn_stmnt(p_parser);
     } else {
         grammar_expression(p_parser);
@@ -54,12 +54,12 @@ void grammar_expression(parser_t* p_parser)
         grammar_expression(p_parser);
         parser_expect(p_parser, T_RPAR);
         parser_reduce(p_parser, mark);
-    } else if (parser_accept_str(p_parser, T_VAR, "if")) {
+    } else if (parser_accept_str(p_parser, T_ID, "if")) {
         grammar_if_stmnt(p_parser);
-    } else if (parser_accept_str(p_parser, T_VAR, "fn")) {
+    } else if (parser_accept_str(p_parser, T_ID, "fn")) {
         grammar_fn_stmnt(p_parser);
-    } else if (parser_peek(p_parser)->type == T_VAR) {
-        parser_expect(p_parser, T_VAR);
+    } else if (parser_peek(p_parser)->type == T_ID) {
+        parser_expect(p_parser, T_ID);
         if (parser_peek(p_parser)->type == T_LPAR) {
             grammar_arglist(p_parser);
         }
@@ -102,7 +102,7 @@ void grammar_if_stmnt(parser_t* p_parser)
     size_t mark = parser_mark(p_parser);
     grammar_expression(p_parser);
     grammar_expression(p_parser);
-    if (parser_accept_str(p_parser, T_VAR, "else")) {
+    if (parser_accept_str(p_parser, T_ID, "else")) {
         grammar_expression(p_parser);
     }
     parser_expect(p_parser,T_END);
@@ -115,7 +115,7 @@ void grammar_fn_stmnt(parser_t* p_parser)
     parser_expect(p_parser, T_LPAR);
     size_t mark2 = parser_mark(p_parser);
     while(parser_peek(p_parser)->type != T_RPAR) {
-        parser_expect(p_parser, T_VAR);
+        parser_expect(p_parser, T_ID);
         if(parser_peek(p_parser)->type != T_RPAR)
             parser_expect(p_parser, T_COMMA);
     }

diff --git a/source/sclpl/lexer.c b/source/sclpl/lexer.c
index 9078357a04f3d40490aa9cb9f3ce988a69cff98d..d4982351f5dc00aa19133da4e0065a1d70d109f3 100644 (file)
--- a/source/sclpl/lexer.c
+++ b/source/sclpl/lexer.c
@@ -170,7 +170,7 @@ static lex_tok_t* lexer_bool(char* text)
 
 static lex_tok_t* lexer_var(char* text)
 {
-    return lex_tok_new(T_VAR, lexer_dup(text));
+    return lex_tok_new(T_ID, lexer_dup(text));
 }
 
 static bool lexer_oneof(const char* class, char c) {

diff --git a/source/sclpl/lexer.h b/source/sclpl/lexer.h
index 5fb0ea20a2b034bf3edece2da1d6cd15808f189b..1f345e731c8067b7f5df09550b93c204efb7f4b2 100644 (file)
--- a/source/sclpl/lexer.h
+++ b/source/sclpl/lexer.h
@@ -17,7 +17,7 @@ typedef struct {
 } lexer_t;
 
 typedef enum {
-    T_VAR, T_CHAR, T_INT, T_FLOAT, T_BOOL, T_STRING, T_LBRACE, T_RBRACE, T_LBRACK,
+    T_ID, T_CHAR, T_INT, T_FLOAT, T_BOOL, T_STRING, T_LBRACE, T_RBRACE, T_LBRACK,
     T_RBRACK, T_LPAR, T_RPAR, T_COMMA, T_SQUOTE, T_DQUOTE, T_END, T_END_FILE
 } lex_tok_type_t;
 

diff --git a/source/sclpl/pprint.c b/source/sclpl/pprint.c
index 6d51eab93526e92a51220e161a749b7083946232..36bf2d8356c858ccfe7e2a968cf7b988670c7773 100644 (file)
--- a/source/sclpl/pprint.c
+++ b/source/sclpl/pprint.c
@@ -25,7 +25,7 @@ static const char* token_type_to_string(lex_tok_type_t type) {
         case T_LPAR:     return "T_LPAR";
         case T_RPAR:     return "T_RPAR";
         case T_COMMA:    return "T_COMMA";
-        case T_VAR:      return "T_VAR";
+        case T_ID:       return "T_ID";
         case T_END:      return "T_END";
         case T_SQUOTE:   return "T_SQUOTE";
         case T_DQUOTE:   return "T_DQUOTE";
@@ -64,7 +64,7 @@ void pprint_token_value(FILE* file, lex_tok_t* token) {
         case T_INT:    fprintf(file, "%ld",  *((long int*)value));              break;
         case T_FLOAT:  fprintf(file, "%f",   *((double*)value));                break;
         case T_BOOL:   fprintf(file, "%s",   ((intptr_t)value)?"true":"false"); break;
-        case T_VAR:    fprintf(file, "%s",   ((char*)value));                   break;
+        case T_ID:     fprintf(file, "%s",   ((char*)value));                   break;
         default:       fprintf(file, "???");                                    break;
     }
 }