X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=b75ac6722cde03d45d2c26ebdf215a7e23502e8a;hp=99054b671fc61223fa5f101c5fa54c538f13ba2c;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=4b5ceb304b924c50eaf8263ad394493ff806fed4

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 99054b6..b75ac67 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -1,10 +1,13 @@
 %include {
+#include <stddef.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdarg.h>
 
 #include "parser.h"
 
+void psi_error(int, const char *, int, const char *, ...);
 }
 
 %name PSI_ParserProc
@@ -15,24 +18,30 @@
 %extra_argument {PSI_Parser *P}
 /* TOKEN is defined inside syntax_error */
 %syntax_error {
-	if (TOKEN) {
-		PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
+	++P->errors;
+	if (TOKEN && TOKEN->type != PSI_T_EOF) {
+		psi_error(PSI_WARNING, TOKEN->file, TOKEN->line, "PSI syntax error: Unexpected token '%s'", TOKEN->text);
 	} else {
-		PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected end of input");
+		psi_error(PSI_WARNING, P->psi.file.fn, P->line, "PSI syntax error: Unexpected end of input");
 	}
 }
 
 %nonassoc NAME.
-%fallback NAME FREE SET LET RETURN LIB INT.
+%left PLUS MINUS.
+%left SLASH ASTERISK.
+%fallback NAME TEMP FREE SET LET RETURN LIB STRING.
 
 file ::= blocks.
 
 blocks ::= block.
 blocks ::= blocks block.
 
+block ::= EOF.
+block ::= EOS.
+
 block ::= LIB(T) QUOTED_STRING(libname) EOS. {
 	if (P->psi.file.ln) {
-		PSI_ParserSyntaxError(P, P->psi.file.ln, T->line, "Extra 'lib %s' statement has no effect", libname->text);
+		P->error(P, T, PSI_WARNING, "Extra 'lib %s' statement has no effect", libname->text);
 	} else {
 		P->psi.file.ln = strndup(libname->text + 1, libname->size - 2);
 	}
@@ -51,6 +60,9 @@ block ::= decl_typedef(def). {
 	if (def->type->strct) {
 		P->structs = add_decl_struct(P->structs, def->type->strct);
 	}
+	if (def->type->enm) {
+		P->enums = add_decl_enum(P->enums, def->type->enm);
+	}
 }
 block ::= constant(constant). {
 	P->consts = add_constant(P->consts, constant);
@@ -58,22 +70,126 @@ block ::= constant(constant). {
 block ::= decl_struct(strct). {
 	P->structs = add_decl_struct(P->structs, strct);
 }
+block ::= decl_union(u). {
+	P->unions = add_decl_union(P->unions, u);
+}
+block ::= decl_enum(e). {
+	P->enums = add_decl_enum(P->enums, e);
+}
+
+optional_name(n) ::= .{
+	n = NULL;
+}
+optional_name(n) ::= NAME(N). {
+	n = N;
+}
+
+enum_name(n) ::= ENUM(E) optional_name(N). {
+	if (N) {
+		n = N;
+		free(E);
+	} else {
+		char digest[17];
+
+		PSI_TokenHash(E, digest);
+		n = PSI_TokenTranslit(PSI_TokenAppend(E, 1, digest), " ", "@");
+	}
+}
+
+%type decl_enum {decl_enum *}
+%destructor decl_enum {free_decl_enum($$);}
+decl_enum(e) ::= enum_name(N) LBRACE decl_enum_items(list) RBRACE. {
+	e = init_decl_enum(N->text, list);
+	e->token = N;
+}
+
+%type decl_enum_items {decl_enum_items*}
+%destructor decl_enum_items {free_decl_enum_items($$);}
+decl_enum_items(l) ::= decl_enum_item(i). {
+	l = init_decl_enum_items(i);
+}
+decl_enum_items(l) ::= decl_enum_items(l_) COMMA decl_enum_item(i). {
+	l = add_decl_enum_item(l_, i);
+}
+
+%type decl_enum_item {decl_enum_item*}
+%destructor decl_enum_item {free_decl_enum_item($$);}
+decl_enum_item(i) ::= NAME(N) EQUALS num_exp(num). {
+	i = init_decl_enum_item(N->text, num);
+	i->token = N;
+}
+decl_enum_item(i) ::= NAME(N). {
+	i = init_decl_enum_item(N->text, NULL);
+	i->token = N;
+}
+
+union_name(n) ::= UNION(U) optional_name(N). {
+	if (N) {
+		n = N;
+		free(U);
+	} else {
+		char digest[17];
+
+		PSI_TokenHash(U, digest);
+		n = PSI_TokenTranslit(PSI_TokenAppend(U, 1, digest), " ", "@");
+	}
+}
+
+struct_name(n) ::= STRUCT(S) optional_name(N). {
+	if (N) {
+		n = N;
+		free(S);
+	} else {
+		char digest[17];
+
+		PSI_TokenHash(S, digest);
+		n = PSI_TokenTranslit(PSI_TokenAppend(S, 1, digest), " ", "@");
+	}
+}
+
+%type decl_struct_args_block {decl_args*}
+%destructor decl_struct_args_block {free_decl_args($$);}
+decl_struct_args_block(args_) ::= LBRACE struct_args(args) RBRACE. {
+	args_ = args;
+}
+%type decl_struct_args {decl_args*}
+%destructor decl_struct_args {free_decl_args($$);}
+decl_struct_args(args_) ::= decl_struct_args_block(args). {
+	args_ = args;
+}
+decl_struct_args(args_) ::= EOS. {
+	args_ = init_decl_args(NULL);
+}
+
 
 %type decl_struct {decl_struct*}
 %destructor decl_struct {free_decl_struct($$);}
-decl_struct(strct) ::= STRUCT NAME(N) struct_size(size_) LBRACE struct_args(args) RBRACE. {
+decl_struct(strct) ::= STRUCT NAME(N) align_and_size(as) decl_struct_args(args). {
 	strct = init_decl_struct(N->text, args);
-	strct->size = size_;
-	free(N);
+	strct->align = as.a;
+	strct->size = as.s;
+	strct->token = N;
 }
 
-%type struct_size {size_t}
-struct_size(size) ::= . {
-	size = 0;
+%type align_and_size { struct {size_t a; size_t s; } }
+align_and_size(as) ::= . {
+	as.a = 0;
+	as.s = 0;
 }
-struct_size(size) ::= COLON COLON LPAREN NUMBER(SIZ) RPAREN. {
-	size = atol(SIZ->text);
-	free(SIZ);
+align_and_size(as) ::= COLON COLON LPAREN NUMBER(A) COMMA NUMBER(S) RPAREN. {
+	as.a = atol(A->text);
+	as.s = atol(S->text);
+	free(A);
+	free(S);
+}
+
+%type decl_union {decl_union*}
+%destructor decl_union {free_decl_union($$);}
+decl_union(u) ::= UNION NAME(N) align_and_size(as) decl_struct_args(args). {
+	u = init_decl_union(N->text, args);
+	u->align = as.a;
+	u->size = as.s;
+	u->token = N;
 }
 
 %token_class const_type_token BOOL INT FLOAT STRING.
@@ -90,28 +206,87 @@ constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
 	free(T);
 }
 
-%type decl_typedef {decl_typedef*}
-%destructor decl_typedef {free_decl_typedef($$);}
-decl_typedef(def) ::= TYPEDEF decl_type(type) NAME(ALIAS) EOS. {
-	def = init_decl_typedef(ALIAS->text, type);
-	free(ALIAS);
+%type decl_typedef {decl_arg*}
+%destructor decl_typedef {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
 }
-/* support opaque types */
-decl_typedef(def) ::= TYPEDEF VOID(V) NAME(ALIAS) EOS. {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(V->type, V->text));
-	free(V);
-	free(ALIAS);
+decl_typedef(def) ::= TYPEDEF(T) decl_typedef_body(def_) EOS. {
+	def = def_;
+	def->token = T;
 }
-decl_typedef(def) ::= TYPEDEF STRUCT(S) NAME(N) NAME(ALIAS) EOS. {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(S->type, N->text));
-	free(ALIAS);
-	free(S);
-	free(N);
+%type decl_typedef_body_ex {decl_arg*}
+%destructor decl_typedef_body_ex {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->unn) {
+		free_decl_union($$->type->unn);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
+decl_typedef_body_ex(def) ::= struct_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
+	def = init_decl_arg(init_decl_type(PSI_T_STRUCT, N->text), var);
+	def->type->token = PSI_TokenCopy(N);
+	def->type->strct = init_decl_struct(N->text, args);
+	def->type->strct->token = N;
+	def->type->strct->align = as.a;
+	def->type->strct->size = as.s;
+}
+decl_typedef_body_ex(def) ::= union_name(N) align_and_size(as) decl_struct_args_block(args) decl_var(var). {
+	def = init_decl_arg(init_decl_type(PSI_T_UNION, N->text), var);
+	def->type->token = PSI_TokenCopy(N);
+	def->type->unn = init_decl_union(N->text, args);
+	def->type->unn->token = N;
+	def->type->unn->align = as.a;
+	def->type->unn->size = as.s;
+}
+decl_typedef_body_ex(def) ::= decl_enum(e) NAME(ALIAS). {
+	def = init_decl_arg(init_decl_type(PSI_T_ENUM, e->name), init_decl_var(ALIAS->text, 0, 0));
+	def->var->token = ALIAS;
+	def->type->token = PSI_TokenCopy(e->token);
+	def->type->enm = e;
+}
+%type decl_typedef_body {decl_arg*}
+%destructor decl_typedef_body {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->unn) {
+		free_decl_union($$->type->unn);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
 }
-decl_typedef(def) ::= TYPEDEF decl_struct(s) NAME(ALIAS) EOS. {
-	def = init_decl_typedef(ALIAS->text, init_decl_type(PSI_T_STRUCT, s->name));
-	def->type->strct = s;
-	free(ALIAS);
+decl_typedef_body(def) ::= decl_typedef_body_ex(def_). {
+	def = def_;
+}
+decl_typedef_body(def) ::= decl_func(func_) LPAREN decl_args(args) RPAREN. {
+	def = init_decl_arg(init_decl_type(PSI_T_FUNCTION, func_->var->name), copy_decl_var(func_->var));
+	def->type->token = PSI_TokenCopy(func_->token);
+	def->type->func = init_decl(init_decl_abi("default"), func_, args);
+}
+decl_typedef_body(def) ::= decl_arg(arg). {
+	def = arg;
 }
 
 %type decl {decl*}
@@ -131,26 +306,27 @@ decl_func(func) ::= VOID(T) NAME(N). {
 		init_decl_type(T->type, T->text),
 		init_decl_var(N->text, 0, 0)
 	);
-	free(T);
-	free(N);
+	func->type->token = T;
+	func->var->token = N;
+	func->token = N;
 }
 
 %type decl_abi {decl_abi*}
 %destructor decl_abi {free_decl_abi($$);}
 decl_abi(abi) ::= NAME(T). {
 	abi = init_decl_abi(T->text);
-	free(T);
+	abi->token = T;
 }
 
 %type decl_var {decl_var*}
 %destructor decl_var {free_decl_var($$);}
 decl_var(var) ::= indirection(p) NAME(T). {
 	var = init_decl_var(T->text, p, 0);
-	free(T);
+	var->token = T;
 }
 decl_var(var) ::= indirection(p) NAME(T) LBRACKET NUMBER(D) RBRACKET. {
 	var = init_decl_var(T->text, p+1, atol(D->text));
-	free(T);
+	var->token = T;
 	free(D);
 }
 
@@ -174,16 +350,18 @@ decl_arg(arg_) ::= VOID(T) pointers(p) NAME(N). {
 		init_decl_type(T->type, T->text),
 		init_decl_var(N->text, p, 0)
 	);
-	free(T);
-	free(N);
+	arg_->type->token = T;
+	arg_->var->token = N;
+	arg_->token = N;
 }
 decl_arg(arg_) ::= CONST VOID(T) pointers(p) NAME(N). {
 	arg_ = init_decl_arg(
 		init_decl_type(T->type, T->text),
 		init_decl_var(N->text, p, 0)
 	);
-	free(T);
-	free(N);
+	arg_->type->token = T;
+	arg_->var->token = N;
+	arg_->token = N;
 }
 
 %type decl_args {decl_args*}
@@ -196,6 +374,10 @@ decl_args(args) ::= decl_arg(arg). {
 decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
 	args = add_decl_arg(args_, arg);
 }
+decl_args(args) ::= decl_args(args_) COMMA ELLIPSIS. {
+	args = args_;
+	args->varargs = 1;
+}
 %type struct_args {decl_args*}
 %destructor struct_args {free_decl_args($$);}
 struct_args(args) ::= struct_arg(arg). {
@@ -205,7 +387,27 @@ struct_args(args) ::= struct_args(args_) struct_arg(arg). {
 	args = add_decl_arg(args_, arg);
 }
 %type struct_arg {decl_arg*}
-%destructor struct_arg {free_decl_arg($$);}
+%destructor struct_arg {
+	free_decl_arg($$);
+	if ($$->type->strct) {
+		free_decl_struct($$->type->strct);
+	}
+	if ($$->type->enm) {
+		free_decl_enum($$->type->enm);
+	}
+	if ($$->type->func) {
+		free_decl($$->type->func);
+	}
+}
+struct_arg(arg_) ::= decl_typedef_body_ex(def) EOS. {
+	arg_ = def;
+	if (def->type->strct) {
+		P->structs = add_decl_struct(P->structs, def->type->strct);
+	}
+	if (def->type->enm) {
+		P->enums = add_decl_enum(P->enums, def->type->enm);
+	}
+}
 struct_arg(arg) ::= decl_arg(arg_) struct_layout(layout_) EOS. {
 	arg_->layout = layout_;
 	arg = arg_;
@@ -222,33 +424,109 @@ struct_layout(layout) ::= COLON COLON LPAREN NUMBER(POS) COMMA NUMBER(SIZ) RPARE
 	free(SIZ);
 }
 
-%token_class decl_type_token FLOAT DOUBLE INT8 UINT8 INT16 UINT16 INT32 UINT32 INT64 UINT64 NAME.
-%type decl_type {decl_type*}
-%destructor decl_type {free_decl_type($$);}
-decl_type(type_) ::= decl_type_token(T). {
+/* un/signed, urgh */
+decl_scalar_type(type_) ::= CHAR(C). {
+	type_ = C;
+}
+decl_scalar_type(type_) ::= SHORT(S) decl_scalar_type_short(s). {
+	if (s) {
+		type_ = PSI_TokenCat(2, S, s);
+		free(S);
+		free(s);
+	} else {
+		type_ = S;
+	}
+}
+decl_scalar_type_short(s) ::= . {
+	s = NULL;
+}
+
+decl_scalar_type_short(s) ::= INT(I). {
+	s = I;
+}
+decl_scalar_type(type_) ::= INT(I). {
+	type_ = I;
+}
+decl_scalar_type(type_) ::= LONG(L) decl_scalar_type_long(l). {
+	if (l) {
+		type_ = PSI_TokenCat(2, L, l);
+		free(L);
+		free(l);
+	} else {
+		type_ = L;
+	}
+}
+decl_scalar_type_long(l) ::= . {
+	l = NULL;
+}
+decl_scalar_type_long(l) ::= DOUBLE(D). {
+	l = D;
+}
+decl_scalar_type_long(l) ::= LONG(L) decl_scalar_type_long_long(ll). {
+	if (ll) {
+		l = PSI_TokenCat(2, L, ll);
+		free(L);
+		free(ll);
+	} else {
+		l = L;
+	}
+}
+decl_scalar_type_long_long(ll) ::= . {
+	ll = NULL;
+}
+decl_scalar_type_long_long(ll) ::= INT(I). {
+	ll = I;
+}
+decl_type(type_) ::= UNSIGNED(U) decl_scalar_type(N). {
+	PSI_Token *T = PSI_TokenCat(2, U, N);
 	type_ = init_decl_type(T->type, T->text);
-	free(T);
+	type_->token = T;
+	free(U);
+	free(N);
 }
-/* unsigned, urgh */
-decl_type(type_) ::= UNSIGNED NAME(T). {
+decl_type(type_) ::= SIGNED(S) decl_scalar_type(N). {
+	PSI_Token *T = PSI_TokenCat(2, S, N);
 	type_ = init_decl_type(T->type, T->text);
-	type_->name = realloc(type_->name, T->size + sizeof("unsigned"));
-	memmove(type_->name + sizeof("unsigned"), type_->name, T->size);
-	memcpy(type_->name, "unsigned", sizeof("unsigned")-1);
-	type_->name[sizeof("unsigned")] = ' ';
-	type_->name[T->size + sizeof("unsigned")] = 0;
-}
-/* we have to support plain int here because we have it in our lexer rules */
-decl_type(type_) ::= INT(T). {
-	type_ = init_decl_type(PSI_T_NAME, T->text);
-	free(T);
+	type_->token = T;
+	free(S);
+	free(N);
+}
+decl_type(type_) ::= UNSIGNED(U). {
+	type_ = init_decl_type(PSI_T_NAME, U->text);
+	type_->token = U;
+}
+decl_type(type_) ::= SIGNED(S). {
+	type_ = init_decl_type(PSI_T_NAME, S->text);
+	type_->token = S;
+}
+decl_type(type_) ::= decl_scalar_type(N). {
+	type_ = init_decl_type(N->type, N->text);
+	type_->token = N;
 }
 /* structs ! */
 decl_type(type_) ::= STRUCT(S) NAME(T). {
 	type_ = init_decl_type(S->type, T->text);
+	type_->token = T;
 	free(S);
-	free(T);
 }
+decl_type(type_) ::= UNION(U) NAME(T). {
+	type_ = init_decl_type(U->type, T->text);
+	type_->token = T;
+	free(U);
+}
+decl_type(type_) ::= ENUM(E) NAME(T). {
+	type_ = init_decl_type(E->type, T->text);
+	type_->token = T;
+	free(E);
+}
+%token_class decl_type_token FLOAT DOUBLE INT8 UINT8 INT16 UINT16 INT32 UINT32 INT64 UINT64 NAME.
+%type decl_type {decl_type*}
+%destructor decl_type {free_decl_type($$);}
+decl_type(type_) ::= decl_type_token(T). {
+	type_ = init_decl_type(T->type, T->text);
+	type_->token = T;
+}
+
 
 %type const_decl_type {decl_type*}
 %destructor const_decl_type {free_decl_type($$);}
@@ -267,13 +545,9 @@ impl(impl) ::= impl_func(func) LBRACE impl_stmts(stmts) RBRACE. {
 
 %type impl_func {impl_func*}
 %destructor impl_func {free_impl_func($$);}
-impl_func(func) ::= FUNCTION NSNAME(NAME) impl_args(args) COLON impl_type(type). {
-	func = init_impl_func(NAME->text, args, type, 0);
-	free(NAME);
-}
-impl_func(func) ::= FUNCTION REFERENCE NSNAME(NAME) impl_args(args) COLON impl_type(type). {
-	func = init_impl_func(NAME->text, args, type, 1);
-	free(NAME);
+impl_func(func) ::= FUNCTION reference(r) NSNAME(NAME) impl_args(args) COLON impl_type(type). {
+	func = init_impl_func(NAME->text, args, type, r);
+	func->token = NAME;
 }
 
 %token_class impl_def_val_token NULL NUMBER TRUE FALSE QUOTED_STRING.
@@ -286,13 +560,9 @@ impl_def_val(def) ::= impl_def_val_token(T). {
 
 %type impl_var {impl_var*}
 %destructor impl_var {free_impl_var($$);}
-impl_var(var) ::= DOLLAR NAME(T). {
-	var = init_impl_var(T->text, 0);
-	free(T);
-}
-impl_var(var) ::= REFERENCE DOLLAR NAME(T). {
-	var = init_impl_var(T->text, 1);
-	free(T);
+impl_var(var) ::= reference(r) DOLLAR NAME(T). {
+	var = init_impl_var(T->text, r);
+	var->token = T;
 }
 
 %type impl_arg {impl_arg*}
@@ -312,6 +582,18 @@ impl_args(args) ::= LPAREN RPAREN. {
 impl_args(args) ::= LPAREN impl_arg_list(args_) RPAREN. {
 	args = args_;
 }
+impl_args(args) ::= LPAREN impl_arg_list(args_) COMMA impl_vararg(va) RPAREN. {
+	args = args_;
+	args->vararg.name = va;
+}
+
+%type impl_vararg {impl_arg*}
+%destructor impl_vararg {free_impl_arg($$);}
+impl_vararg(va) ::= impl_type(type) reference(r) ELLIPSIS DOLLAR NAME(T). {
+	va = init_impl_arg(type, init_impl_var(T->text, r), NULL);
+	free(T);
+}
+
 %type impl_arg_list {impl_args*}
 %destructor impl_arg_list {free_impl_args($$);}
 impl_arg_list(args) ::= impl_arg(arg). {
@@ -345,43 +627,67 @@ impl_stmt(stmt) ::= free_stmt(free). {
 	stmt = init_impl_stmt(PSI_T_FREE, free);
 }
 
+%token_class num_exp_token NUMBER NSNAME.
+%token_class num_exp_op_token PLUS MINUS ASTERISK SLASH.
+%type num_exp {num_exp*}
+%destructor num_exp {free_num_exp($$);}
+num_exp(exp) ::= num_exp_token(tok). {
+	exp = init_num_exp(tok->type, tok->text);
+	exp->token = tok;
+}
+num_exp(exp) ::= decl_var(var). {
+	exp = init_num_exp(PSI_T_NAME, var);
+	exp->token = PSI_TokenCopy(var->token);
+}
+num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
+	exp_->operator = operator_->type;
+	exp_->operand = operand_;
+	exp = exp_;
+	free(operator_);
+}
+
 %type let_stmt {let_stmt*}
 %destructor let_stmt {free_let_stmt($$);}
 let_stmt(let) ::= LET decl_var(var) EOS. {
-	let = init_let_stmt(var, NULL);
+	let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL));
 }
-let_stmt(let) ::= LET decl_var(var) EQUALS let_value(val) EOS. {
+let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_val(val) EOS. {
+	val->flags.one.is_reference = r ? 1 : 0;
 	let = init_let_stmt(var, val);
 }
+let_stmt(let) ::= TEMP decl_var(var) EQUALS decl_var(val) EOS. {
+	let = init_let_stmt(var, init_let_val(PSI_LET_TMP, val));
+}
 
-%type let_value {let_value*}
-%destructor let_value {free_let_value($$);}
-let_value(val) ::= CALLOC(F) LPAREN NUMBER(N) COMMA decl_type(t) RPAREN. {
-	val = init_let_value(
-		init_let_func(F->type, F->text,
-			init_let_calloc(
-				atol(N->text), t
-			)
-		), NULL, 0
-	);
-	free(F);
-	free(N);
+%type let_val {let_val*}
+%destructor let_val {free_let_val($$);}
+let_val(val) ::= NULL. {
+	val = init_let_val(PSI_LET_NULL, NULL);
+}
+let_val(val) ::= num_exp(exp). {
+	val = init_let_val(PSI_LET_NUMEXP, exp);
 }
-let_value(val) ::= reference(r) let_func(func) LPAREN impl_var(var) RPAREN. {
-	val = init_let_value(func, var, r);
+let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
+	val = init_let_val(PSI_LET_CALLOC, alloc);
 }
-let_value(val) ::= reference(r) NULL. {
-	val = init_let_value(NULL, NULL, r);
+let_val(val) ::= let_func(func). {
+	val = init_let_val(PSI_LET_FUNC, func);
 }
 
-%token_class let_func_token ARRVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
+%type let_calloc {let_calloc*}
+%destructor let_calloc {free_let_calloc($$);}
+let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
+	alloc = init_let_calloc(nmemb, size);
+}
+%token_class let_func_token OBJVAL ARRVAL PATHVAL STRLEN STRVAL FLOATVAL INTVAL BOOLVAL.
 %type let_func {let_func*}
 %destructor let_func {free_let_func($$);}
-let_func(func) ::= let_func_token(T). {
-	func = init_let_func(T->type, T->text, NULL);
+let_func(func) ::= let_func_token(T) LPAREN impl_var(var) RPAREN. {
+	func = init_let_func(T->type, T->text, var);
 	free(T);
 }
 
+
 %type set_stmt {set_stmt*}
 %destructor set_stmt {free_set_stmt($$);}
 set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
@@ -390,13 +696,28 @@ set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
 
 %type set_value {set_value*}
 %destructor set_value {free_set_value($$);}
-set_value(val) ::= set_func(func) LPAREN decl_vars(vars) RPAREN. {
-	val = init_set_value(func, vars);
+set_value(val) ::= set_func(func) LPAREN decl_var(var) RPAREN. {
+	val = init_set_value(func, init_decl_vars(var));
+}
+set_value(val) ::= set_func(func) LPAREN decl_var(var) COMMA num_exp(num_) RPAREN. {
+	val = init_set_value(func, init_decl_vars(var));
+	val->num = num_;
+}
+set_value(val) ::= set_func(func_) LPAREN decl_var(var) COMMA ELLIPSIS(T) RPAREN. {
+	free_set_func(func_);
+	val = init_set_value(init_set_func(T->type, T->text), init_decl_vars(var));
+	val->func->token = T;
 }
-set_value(val) ::= set_func(func_) LPAREN decl_vars(vars_) COMMA set_vals(vals) RPAREN. {
+set_value(val) ::= set_func(func_) LPAREN decl_var(var) COMMA set_vals(vals) RPAREN. {
 	val = vals;
 	val->func = func_;
-	val->vars = vars_;
+	val->vars = init_decl_vars(var);
+}
+set_value(val) ::= set_func(func_) LPAREN decl_var(var) COMMA num_exp(num_) COMMA set_vals(vals) RPAREN. {
+	val = vals;
+	val->func = func_;
+	val->num = num_;
+	val->vars = init_decl_vars(var);
 }
 %type set_vals {set_value*}
 %destructor set_vals {free_set_value($$);}
@@ -407,18 +728,19 @@ set_vals(vals) ::= set_vals(vals_) COMMA set_value(val). {
 	vals = add_inner_set_value(vals_, val);
 }
 
-%token_class set_func_token TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL VOID.
+%token_class set_func_token TO_OBJECT TO_ARRAY TO_STRING TO_INT TO_FLOAT TO_BOOL VOID.
 %type set_func {set_func*}
 %destructor set_func {free_set_func($$);}
 set_func(func) ::= set_func_token(T). {
 	func = init_set_func(T->type, T->text);
-	free(T);
+	func->token = T;
 }
 
 %type return_stmt {return_stmt*}
 %destructor return_stmt {free_return_stmt($$);}
-return_stmt(ret) ::= RETURN set_value(val) EOS. {
+return_stmt(ret) ::= RETURN(T) set_value(val) EOS. {
 	ret = init_return_stmt(val);
+	ret->token = T;
 }
 
 %type free_stmt {free_stmt*}
@@ -440,9 +762,10 @@ free_calls(calls) ::= free_calls(calls_) COMMA free_call(call). {
 %destructor free_call {free_free_call($$);}
 free_call(call) ::= NAME(F) LPAREN decl_vars(vars) RPAREN. {
 	call = init_free_call(F->text, vars);
+	call->token = F;
 }
 
-%token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY.
+%token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT.
 %type impl_type {impl_type*}
 %destructor impl_type {free_impl_type($$);}
 impl_type(type_) ::= impl_type_token(T). {
@@ -452,12 +775,12 @@ impl_type(type_) ::= impl_type_token(T). {
 
 %type reference {char}
 reference(r) ::= . {r = 0;}
-reference(r) ::= REFERENCE. {r = 1;}
+reference(r) ::= AMPERSAND. {r = 1;}
 
 %type indirection {unsigned}
 indirection(i) ::= . {i = 0;}
 indirection(i) ::= pointers(p). {i = p;}
 
 %type pointers {unsigned}
-pointers(p) ::= POINTER. {p = 1;}
-pointers(p) ::= pointers(P) POINTER. {p = P+1;}
+pointers(p) ::= ASTERISK. {p = 1;}
+pointers(p) ::= pointers(P) ASTERISK. {p = P+1;}