tdlight-team/tl-parser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: tdlight-team:66d26ea25df0f55f1664ba39110dc7eef18a5617
Branches Tags
tdlight-team:master
tdlight-team:master-tdlight
...
compare: tdlight-team:f49077de7f7aa5721483c5686182deebad5e78dd
Branches Tags
tdlight-team:master-tdlight
tdlight-team:master

3 Commits
66d26ea25d ... f49077de7f

Author SHA1 Message Date
Arseny Smirnov
f49077de7f Add builtin types: function and object 2018-02-15 13:42:26 +03:00
vvaltman
a111989860 added multiple ns 2018-02-15 12:32:55 +03:00
vysheng
36bf1902ff Merge pull request #5 from BenWiederhake/develop 
Fix endianess, clean up on the way.
 2015-10-17 16:33:25 +03:00
1 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

7
tl-parser.c
View File

@ -265,7 +265,7 @@ char *parse_lex (void) {
parse.lex.type = lex_lc_ident;
return (parse.lex.ptr = p);
}
if (curch == '.') {
while (curch == '.') {
parse.lex.flags |= 1;
nextch ();
if (is_uletter (curch)) {
@ -2445,6 +2445,8 @@ int tl_parse_builtin_combinator_decl (struct tree *T, int fun) {
if ((!mystrcmp2 (T->c[0]->text, T->c[0]->len, "int") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "Int")) ||
(!mystrcmp2 (T->c[0]->text, T->c[0]->len, "long") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "Long")) ||
(!mystrcmp2 (T->c[0]->text, T->c[0]->len, "double") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "Double")) ||
(!mystrcmp2 (T->c[0]->text, T->c[0]->len, "object") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "Object")) ||
(!mystrcmp2 (T->c[0]->text, T->c[0]->len, "function") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "Function")) ||
(!mystrcmp2 (T->c[0]->text, T->c[0]->len, "string") && !mystrcmp2 (T->c[1]->text, T->c[1]->len, "String"))) {
struct tl_type *t = tl_add_type (T->c[1]->text, T->c[1]->len, 0, 0);
if (!t) {
@ -2951,7 +2953,8 @@ void write_type (struct tl_type *t) {
}
int is_builtin_type (const char *id) {
return !strcmp (id, "int") || !strcmp (id, "long") || !strcmp (id, "double") || !strcmp (id, "string");
return !strcmp (id, "int") || !strcmp (id, "long") || !strcmp (id, "double") || !strcmp (id, "string")
|| !strcmp(id, "object") || !strcmp(id, "function");
}
void write_combinator (struct tl_constructor *c) {