#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
%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 INT LONG SIGNED UNSIGNED.
file ::= blocks.
blocks ::= block.
blocks ::= blocks block.
+block ::= EOF.
+
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(T, PSI_WARNING, "Extra 'lib %s' statement has no effect", libname->text);
} else {
P->psi.file.ln = strndup(libname->text + 1, libname->size - 2);
}
decl_struct(strct) ::= STRUCT NAME(N) struct_size(size_) LBRACE struct_args(args) RBRACE. {
strct = init_decl_struct(N->text, args);
strct->size = size_;
- free(N);
+ strct->token = N;
}
%type struct_size {size_t}
%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);
+ def->token = ALIAS;
}
/* 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);
+ def->token = ALIAS;
+ def->type->token = V;
}
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);
+ def->token = ALIAS;
+ def->type->token = N;
free(S);
- 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->token = ALIAS;
+ def->type->token = PSI_TokenCopy(s->token);
def->type->strct = s;
- free(ALIAS);
}
%type decl {decl*}
init_decl_type(T->type, T->text),
init_decl_var(N->text, 0, 0)
);
- free(T);
+ func->type->token = T;
+ //free(T);
free(N);
}
%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);
}
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*}
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;
}
/* unsigned, urgh */
-decl_type(type_) ::= UNSIGNED NAME(T). {
+decl_type(type_) ::= UNSIGNED(U) NAME(N). {
+ PSI_Token *T = PSI_TokenCat(2, U, 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;
+ type_->token = T;
+ free(U);
+ free(N);
}
-/* we have to support plain int here because we have it in our lexer rules */
+decl_type(type_) ::= SIGNED NAME(T). {
+ type_ = init_decl_type(T->type, T->text);
+ type_->token = T;
+ type_->name = realloc(type_->name, T->size + sizeof("signed"));
+ memmove(type_->name + sizeof("signed"), type_->name, T->size);
+ memcpy(type_->name, "signed", sizeof("signed")-1);
+ type_->name[sizeof("signed")] = ' ';
+ type_->name[T->size + sizeof("signed")] = 0;
+}
+/* we have to support plain int, long 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;
+}
+decl_type(type_) ::= LONG INT(T). {
+ type_ = init_decl_type(PSI_T_NAME, T->text);
+ type_->token = T;
}
/* structs ! */
decl_type(type_) ::= STRUCT(S) NAME(T). {
type_ = init_decl_type(S->type, T->text);
+ type_->token = T;
free(S);
- 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 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.
%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*}
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). {
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. {
%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_vars(vars_) COMMA set_vals(vals) RPAREN. {
+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_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($$);}
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*}
%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). {
%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;}
projects / m6w6 / ext-psi / blobdiff