X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=d82a90f6f9d2986a03d4e161d1e962544f34f234;hp=c5eecbaf9a044b9f04426589a2dd1d2939e39a39;hb=5abcb8724ac7046d62203ea643e9ce69f63a6a8a;hpb=d59f10e81c33354ee1589fb10847b4611423de2e

diff --git a/src/parser_proc.y b/src/parser_proc.y
index c5eecba..d82a90f 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -2,9 +2,11 @@
 #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,17 +17,18 @@
 %extra_argument {PSI_Parser *P}
 /* TOKEN is defined inside syntax_error */
 %syntax_error {
+	++P->errors;
 	if (TOKEN && TOKEN->type != PSI_T_EOF) {
-		PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
+		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.
 %left PLUS MINUS.
 %left SLASH ASTERISK.
-%fallback NAME TEMP FREE SET LET RETURN LIB INT UNSIGNED.
+%fallback NAME TEMP FREE SET LET RETURN LIB INT LONG SIGNED UNSIGNED.
 
 file ::= blocks.
 
@@ -36,7 +39,7 @@ 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);
 	}
@@ -68,7 +71,7 @@ block ::= decl_struct(strct). {
 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}
@@ -98,24 +101,25 @@ constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
 %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*}
@@ -135,7 +139,8 @@ decl_func(func) ::= VOID(T) NAME(N). {
 		init_decl_type(T->type, T->text),
 		init_decl_var(N->text, 0, 0)
 	);
-	free(T);
+	func->type->token = T;
+	//free(T);
 	free(N);
 }
 
@@ -143,18 +148,18 @@ decl_func(func) ::= VOID(T) NAME(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);
 }
 
@@ -178,16 +183,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*}
@@ -200,6 +207,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). {
@@ -231,27 +242,39 @@ struct_layout(layout) ::= COLON COLON LPAREN NUMBER(POS) COMMA NUMBER(SIZ) RPARE
 %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*}
@@ -271,13 +294,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 AMPERSAND 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.
@@ -290,13 +309,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) ::= AMPERSAND 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*}
@@ -316,6 +331,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). {
@@ -355,10 +382,11 @@ impl_stmt(stmt) ::= free_stmt(free). {
 %destructor num_exp {free_num_exp($$);}
 num_exp(exp) ::= num_exp_token(tok). {
 	exp = init_num_exp(tok->type, tok->text);
-	free(tok);
+	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;
@@ -371,10 +399,7 @@ num_exp(exp) ::= num_exp(exp_) num_exp_op_token(operator_) num_exp(operand_). {
 %destructor let_stmt {free_let_stmt($$);}
 let_stmt(let) ::= LET decl_var(var) EOS. {
 	let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL));
-}/*
-let_stmt(let) ::= LET decl_var(var) EQUALS let_val(val) EOS. {
-	let = init_let_stmt(var, val);
-}*/
+}
 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);
@@ -397,23 +422,7 @@ let_val(val) ::= CALLOC LPAREN let_calloc(alloc) RPAREN. {
 let_val(val) ::= let_func(func). {
 	val = init_let_val(PSI_LET_FUNC, func);
 }
-/*
-let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) NULL EOS. {
-	let = init_let_stmt(var, init_let_val(PSI_LET_NULL, NULL, r?PSI_LET_REFERENCE:0));
-}
-let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) num_exp(exp) EOS. {
-	let = init_let_stmt(var, init_let_val(PSI_LET_NUMEXP, exp, r?PSI_LET_REFERENCE:0));
-}
-let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) CALLOC LPAREN let_calloc(alloc) RPAREN EOS. {
-	let = init_let_stmt(var, init_let_val(PSI_LET_CALLOC, alloc, r?PSI_LET_REFERENCE:0));
-}
-let_stmt(let) ::= LET decl_var(var) EQUALS reference(r) let_func(func) EOS. {
-	let = init_let_stmt(var, init_let_val(PSI_LET_FUNC, func, r?PSI_LET_REFERENCE:0));
-}
-let_stmt(let) ::= LET decl_var(var) EQUALS decl_var(val) EOS. {
-	let = init_let_stmt(var, init_let_val(PSI_LET_VAR, val, 0));
-}
-*/
+
 %type let_calloc {let_calloc*}
 %destructor let_calloc {free_let_calloc($$);}
 let_calloc(alloc) ::= num_exp(nmemb) COMMA num_exp(size). {
@@ -443,6 +452,11 @@ set_value(val) ::= set_func(func) LPAREN decl_var(var) COMMA num_exp(num_) RPARE
 	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_var(var) COMMA set_vals(vals) RPAREN. {
 	val = vals;
 	val->func = func_;
@@ -468,13 +482,14 @@ set_vals(vals) ::= set_vals(vals_) COMMA set_value(val). {
 %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*}
@@ -496,6 +511,7 @@ 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 OBJECT.