%nonassoc NAME.
%left PLUS MINUS.
%left SLASH ASTERISK.
-%fallback NAME FREE SET LET RETURN LIB INT UNSIGNED.
+%fallback NAME TEMP FREE SET LET RETURN LIB INT UNSIGNED.
file ::= blocks.
/* 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);
+ def->type->token = V;
+ //free(V);
free(ALIAS);
}
decl_typedef(def) ::= TYPEDEF STRUCT(S) NAME(N) NAME(ALIAS) EOS. {
def = init_decl_typedef(ALIAS->text, init_decl_type(S->type, N->text));
+ def->type->token = N;
free(ALIAS);
free(S);
- free(N);
+ //free(N);
}
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->token = ALIAS;
def->type->strct = s;
- free(ALIAS);
+ //free(ALIAS);
}
%type decl {decl*}
%destructor decl {free_decl($$);}
decl(decl) ::= decl_abi(abi) decl_func(func) LPAREN decl_args(args) RPAREN EOS. {
decl = init_decl(abi, func, args);
+
}
%type decl_func {decl_arg*}
init_decl_type(T->type, T->text),
init_decl_var(N->text, 0, 0)
);
- free(T);
+ func->type->token = T;
+ //free(T);
free(N);
}
init_decl_type(T->type, T->text),
init_decl_var(N->text, p, 0)
);
- free(T);
+ arg_->type->token = T;
+ //free(T);
free(N);
}
decl_arg(arg_) ::= CONST VOID(T) pointers(p) NAME(N). {
init_decl_type(T->type, T->text),
init_decl_var(N->text, p, 0)
);
- free(T);
+ arg_->type->token = T;
+ //free(T);
free(N);
}
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). {
%destructor decl_type {free_decl_type($$);}
decl_type(type_) ::= decl_type_token(T). {
type_ = init_decl_type(T->type, T->text);
- free(T);
+ type_->token = T;
+ //free(T);
}
/* unsigned, urgh */
decl_type(type_) ::= UNSIGNED NAME(T). {
type_ = init_decl_type(T->type, T->text);
+ type_->token = T;
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;
+ //free(T);
}
/* 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(T);
}
/* structs ! */
decl_type(type_) ::= STRUCT(S) NAME(T). {
type_ = init_decl_type(S->type, T->text);
+ type_->token = T;
free(S);
- free(T);
+ //free(T);
}
%type const_decl_type {decl_type*}
%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 AMPERSAND NSNAME(NAME) impl_args(args) COLON impl_type(type). {
- func = init_impl_func(NAME->text, args, type, 1);
+impl_func(func) ::= FUNCTION reference(r) NSNAME(NAME) impl_args(args) COLON impl_type(type). {
+ func = init_impl_func(NAME->text, args, type, r);
free(NAME);
}
%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) ::= AMPERSAND DOLLAR NAME(T). {
- var = init_impl_var(T->text, 1);
+impl_var(var) ::= reference(r) DOLLAR NAME(T). {
+ var = init_impl_var(T->text, r);
free(T);
}
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 = 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);
+}
+
%type impl_arg_list {impl_args*}
%destructor impl_arg_list {free_impl_args($$);}
impl_arg_list(args) ::= impl_arg(arg). {
%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) ::= decl_arg(arg) EQUALS decl_var(var_) EOS. {
- let = init_let_stmt(arg->var, NULL);
+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) ::= reference(r) CALLOC(F) LPAREN let_calloc(alloc) RPAREN. {
- val = init_let_value(init_let_func(F->type, F->text, alloc), NULL, r);
- free(F);
+%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_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
+ val = init_let_val(PSI_LET_CALLOC, alloc);
+}
+let_val(val) ::= let_func(func). {
+ val = init_let_val(PSI_LET_FUNC, func);
}
+
%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);
}
-
-let_value(val) ::= reference(r) num_exp(exp). {
- val = init_let_value(NULL, NULL, r);
- val->num = exp;
-}
-let_value(val) ::= reference(r) let_func(func) LPAREN impl_var(var) RPAREN. {
- val = init_let_value(func, var, r);
-}
-let_value(val) ::= reference(r) NULL. {
- val = init_let_value(NULL, NULL, r);
-}
-
%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. {
%destructor free_call {free_free_call($$);}
free_call(call) ::= NAME(F) LPAREN decl_vars(vars) RPAREN. {
call = init_free_call(F->text, vars);
+ free(F);
}
%token_class impl_type_token VOID MIXED BOOL INT FLOAT STRING ARRAY OBJECT.
projects / m6w6 / ext-psi / blobdiff