"." , "<" , ">" , "&" , "|" ,
#endif
-#define STORE(X) { \
- printf(X); \
- break; \
+#define STORE(X) { \
+ printf(X); \
+ break; \
}
void parse_debug(struct parsenode *tree) {
- while (tree && tree->next != NULL) {
- /* skip blanks */
- if (tree->type == 0) {
- tree = tree->next;
- continue;
- }
-
+ while (tree) {
switch (tree->type) {
case PARSE_TYPE_ADD: STORE("OPERATOR: ADD \n");
case PARSE_TYPE_BAND: STORE("OPERATOR: BITAND \n");
case PARSE_TYPE_FOR: STORE("LOOP: FOR\n");
case PARSE_TYPE_DO: STORE("LOOP: DO\n");
- case PARSE_TYPE_IDENT: STORE("IDENT: ???\n");
+ //case PARSE_TYPE_IDENT: STORE("IDENT: ???\n");
}
tree = tree->next;
}
}
/*
- * This just skips the token and throws it in the parse tree for later
- * checking / optimization / codegen, it doesn't do anything with it
- * like syntax check for legal use -- like it should as it's a TODO item
- * which is not implemented
+ * Performs a parse operation: This is a macro to prevent bugs, if the
+ * calls to lex_token are'nt exactly enough to feed to the end of the
+ * actual lexees for the current thing that is being parsed, the state
+ * of the next iteration in the creation of the parse tree will be wrong
+ * and everything will fail.
*/
-#define PARSE_TODO(X) { \
- token = lex_token(file); \
- PARSE_TREE_ADD(X); \
- break; \
+#define PARSE_PERFORM(X,C) { \
+ token = lex_token(file); \
+ { C } \
+ while (token != '\n') { \
+ token = lex_token(file); \
+ } \
+ PARSE_TREE_ADD(X); \
+ break; \
}
void parse_clear(struct parsenode *tree) {
tree = tree->next;
mem_d (temp);
}
+
+ /* free any potential typedefs */
+ typedef_clear();
}
-int parse(struct lex_file *file) {
+/*
+ * Generates a parse tree out of the lexees generated by the lexer. This
+ * is where the tree is built. This is where valid check is performed.
+ */
+int parse_tree(struct lex_file *file) {
struct parsenode *parsetree = NULL;
struct parsenode *parseroot = NULL;
parseroot = mem_a(sizeof(struct parsenode));
if (!parseroot)
return error(ERROR_INTERNAL, "Ran out of memory", " ");
- parsetree = parseroot;
+ parsetree = parseroot;
+ parsetree->type = -1; /* not a valid type -- root element */
}
int token = 0;
token != ERROR_PREPRO && file->length >= 0) {
switch (token) {
case TOKEN_IF:
- token = lex_token(file);
- //while ((token == ' ' || token == '\n') && file->length >= 0)
- // token = lex_token(file);
-
- //if (token != '(')
- // error(ERROR_PARSE, "Expected `(` after if\n", "");
-
+ while ((token == ' ' || token == '\n') && file->length >= 0)
+ token = lex_token(file);
PARSE_TREE_ADD(PARSE_TYPE_IF);
break;
case TOKEN_ELSE:
token = lex_token(file);
- //while ((token == ' ' || token == '\n') && file->length >= 0)
- // token = lex_token(file);
-
PARSE_TREE_ADD(PARSE_TYPE_ELSE);
break;
case TOKEN_FOR:
- token = lex_token(file);
- //while ((token == ' ' || token == '\n') && file->length >= 0)
- // token = lex_token(file);
-
+ //token = lex_token(file);
+ while ((token == ' ' || token == '\n') && file->length >= 0)
+ token = lex_token(file);
PARSE_TREE_ADD(PARSE_TYPE_FOR);
break;
typedef_add(f, t);
- /* free stdup strings */
- mem_d(f);
- mem_d(t);
+ free(f);
+ free(t);
+
+ while (token != '\n')
+ token = lex_token(file);
break;
}
+
+ /*
+ * Returns are addable as-is, statement checking is during
+ * the actual parse tree check.
+ */
+ case TOKEN_RETURN:
+ PARSE_TREE_ADD(PARSE_TYPE_RETURN);
+ break;
+ //PARSE_PERFORM(PARSE_TYPE_RETURN, {});
+
-
- case TOKEN_DO: PARSE_TODO(PARSE_TYPE_DO);
- case TOKEN_WHILE: PARSE_TODO(PARSE_TYPE_WHILE);
- case TOKEN_BREAK: PARSE_TODO(PARSE_TYPE_BREAK);
- case TOKEN_CONTINUE: PARSE_TODO(PARSE_TYPE_CONTINUE);
- case TOKEN_RETURN: PARSE_TODO(PARSE_TYPE_RETURN);
- case TOKEN_GOTO: PARSE_TODO(PARSE_TYPE_GOTO);
- case TOKEN_VOID: PARSE_TODO(PARSE_TYPE_VOID);
- case TOKEN_STRING: PARSE_TODO(PARSE_TYPE_STRING);
- case TOKEN_FLOAT: PARSE_TODO(PARSE_TYPE_FLOAT);
- case TOKEN_VECTOR: PARSE_TODO(PARSE_TYPE_VECTOR);
- case TOKEN_ENTITY: PARSE_TODO(PARSE_TYPE_ENTITY);
+ case TOKEN_DO: PARSE_PERFORM(PARSE_TYPE_DO, {});
+ case TOKEN_WHILE: PARSE_PERFORM(PARSE_TYPE_WHILE, {});
+ case TOKEN_BREAK: PARSE_PERFORM(PARSE_TYPE_BREAK, {});
+ case TOKEN_CONTINUE: PARSE_PERFORM(PARSE_TYPE_CONTINUE,{});
+ case TOKEN_GOTO: PARSE_PERFORM(PARSE_TYPE_GOTO, {});
+ case TOKEN_VOID: PARSE_PERFORM(PARSE_TYPE_VOID, {});
+ case TOKEN_STRING: PARSE_PERFORM(PARSE_TYPE_STRING, {});
+ case TOKEN_FLOAT: PARSE_PERFORM(PARSE_TYPE_FLOAT, {});
+ case TOKEN_VECTOR: PARSE_PERFORM(PARSE_TYPE_VECTOR, {});
+ case TOKEN_ENTITY: PARSE_PERFORM(PARSE_TYPE_ENTITY, {});
/*
* From here down is all language punctuation: There is no
token = lex_token(file);
break;
+ case '.':
+ token = lex_token(file);
+ PARSE_TREE_ADD(PARSE_TYPE_DOT);
+ break;
+
case '(':
token = lex_token(file);
PARSE_TREE_ADD(PARSE_TYPE_LPARTH);
parse_debug(parseroot);
lex_reset(file);
parse_clear(parseroot);
-
return 1;
}