corey/lr
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

subtypes

Browse Source
This commit is contained in:
coreydunn 2022-11-18 09:23:09 -06:00
parent d65bb4ba56
commit 4acec63874
6 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -13,6 +13,7 @@ Lexer
* Preidentifiers --> (identifier|keyword)
* Fix string type [DONE]
* Fix operator type
* EVERY lexeme should terminate at a NULL byte
Parser

8
lex.c
View File

@ -100,7 +100,13 @@ void lex_string(Lexer*l,char*s)
//}
break;
case STRING:modematch("\"",true,false);break;
case OPERATOR:modematch(operators,false,true);break;
case OPERATOR:modematch(operators,false,true);
if(s[i]==';')
{
((Tok*)l->tokens.buffer)[l->tokens.size-1].subtype=ENDSTATEMENT;
// Terminate token now
}
break;
case LCOMMENT:modematch("\n",true,true);break;
}

5
lex.h
View File

@ -12,7 +12,8 @@
#define vec_pushl(v,l) do{Tok x=l;vec_push(v,&x);}while(0)
enum LEXTYPE {NONE, IDENTIFIER, INTEGER, FLOAT, STRING, OPERATOR, KEYWORD, LCOMMENT};
enum LEXTYPE {NONE, IDENTIFIER, INTEGER, FLOAT, STRING, OPERATOR, KEYWORD, LCOMMENT, };
enum LEXSUBTYPE {ENDSTATEMENT=55, };
extern char*lextype_names[];
//typedef struct Tok
@ -27,7 +28,7 @@ typedef struct Lexer
uint32_t mode;
} Lexer;
Lexer lex_new(void);
Lexer lex_new();
size_t lex_strchrcount(char*str,char c);
void lex_free(Lexer*l);
void lex_print(Lexer*l);

17
pnode.c
View File

@ -119,32 +119,23 @@ void parser_tokens(Parser*p,Vec*t)
{
Tok*tok=&((Tok*)t->buffer)[i];
// Push token
//current_node->type=STATEMENT;
vec_pushta(&current_node->tokens,tok->str.buffer);
tok_copy_nostr(&((Tok*)current_node->tokens.buffer)[current_node->tokens.size-1],tok);
if(tok->type==OPERATOR && tok->str.buffer[0]==';')
{
//current_node->type=STATEMENT;
vec_pushta(&current_node->tokens,tok->str.buffer);
((Tok*)current_node->tokens.buffer)[current_node->tokens.size-1].line = tok->line;
if(i<t->size-1)
current_node=pnode_pushnode(&p->root);
}
else if(tok->type==LCOMMENT && tok->str.buffer[0]=='#')
else if(tok->type==LCOMMENT)
{
current_node->type=COMMENT;
vec_pushta(&current_node->tokens,tok->str.buffer);
((Tok*)current_node->tokens.buffer)[current_node->tokens.size-1].line = tok->line;
if(i<t->size-1)
current_node=pnode_pushnode(&p->root);
}
else
{
vec_pushta(&current_node->tokens,tok->str.buffer);
((Tok*)current_node->tokens.buffer)[current_node->tokens.size-1].line = tok->line;
}
//vec_pushta(&parser.root.tokens,(((Tok*)lexer.tokens.buffer)[i].str.buffer));
}
}

10
tok.c
View File

@ -7,6 +7,7 @@ Tok tok_new(void)
Tok t={
.str=str_new(),
.type=0,
.subtype=0,
.line=1,
};
@ -18,3 +19,12 @@ void tok_free(Tok*t)
if(!t)return;
str_free(&t->str);
}
// Copy everything but string !!!
void tok_copy_nostr(Tok*dst,Tok*src)
{
if(!dst||!src)return;
dst->type=src->type;
dst->subtype=src->subtype;
dst->line=src->line;
}

4
tok.h
View File

@ -13,8 +13,10 @@ typedef struct Tok
{
Str str;
uint32_t type;
uint32_t subtype;
size_t line;
} Tok;
void tok_free(Tok*t);
Tok tok_new(void);
void tok_copy_nostr(Tok*dst,Tok*src);
void tok_free(Tok*t);