X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fparser_proc.y;h=a189a885081ccf54fafed87e1813bb9fd5082847;hp=3bdcc2201b0b047a2af08570ed2fdca184d66ec0;hb=d9a7378b795f32b91e110bd163c019aa30e79084;hpb=f6b2422d4a9cb0424412a4077241cfd5bcb9ebeb

diff --git a/src/parser_proc.y b/src/parser_proc.y
index 3bdcc22..a189a88 100644
--- a/src/parser_proc.y
+++ b/src/parser_proc.y
@@ -15,8 +15,11 @@
 %extra_argument {PSI_Parser *P}
 /* TOKEN is defined inside syntax_error */
 %syntax_error {
-	PSI_ParserSyntaxError(P, P->fn, P->line, "Unexpected token '%s'", TOKEN->text);
+	PSI_ParserSyntaxError(P, P->psi.file.fn, P->line, "Unexpected token '%s'", TOKEN->text);
 }
+
+%nonassoc NAME.
+
 file ::= blocks.
 
 blocks ::= block.
@@ -25,10 +28,10 @@ blocks ::= blocks block.
 block ::= COMMENT.
 
 block ::= LIB(T) QUOTED_STRING(libname) EOS. {
-	if (P->lib) {
-		PSI_ParserSyntaxError(P, P->fn, T->line, "Extra 'lib %s' statement has no effect", libname->text);
+	if (P->psi.file.ln) {
+		PSI_ParserSyntaxError(P, P->psi.file.ln, T->line, "Extra 'lib %s' statement has no effect", libname->text);
 	} else {
-		P->lib = strndup(libname->text + 1, libname->size - 2);
+		P->psi.file.ln = strndup(libname->text + 1, libname->size - 2);
 	}
 	free(libname);
 	free(T);
@@ -42,12 +45,26 @@ block ::= impl(impl). {
 }
 block ::= decl_typedef(def). {
 	P->defs = add_decl_typedef(P->defs, def);
+	if (def->type->strct) {
+		P->structs = add_decl_struct(P->structs, def->type->strct);
+	}
 }
 block ::= constant(constant). {
 	P->consts = add_constant(P->consts, constant);
 }
+block ::= decl_struct(strct). {
+	P->structs = add_decl_struct(P->structs, strct);
+}
+
+%type decl_struct {decl_struct*}
+%destructor decl_struct {free_decl_struct($$);}
+decl_struct(strct) ::= STRUCT NAME(N) LBRACE struct_args(args) RBRACE. {
+	strct = init_decl_struct(N->text, args);
+	free(N);
+}
 
 %type const_type {const_type*}
+%destructor const_type {free_const_type($$);}
 const_type(type_) ::= BOOL(T). {
 	type_ = init_const_type(T->type, T->text);
 	free(T);
@@ -65,29 +82,45 @@ const_type(type_) ::= STRING(T). {
 	free(T);
 }
 %type constant {constant*}
+%destructor constant {free_constant($$);}
 constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val) EOS. {
 	constant = init_constant(type, T->text, val);
 	free(T);
 }
 
 %type decl_typedef {decl_typedef*}
-decl_typedef(def) ::= TYPEDEF NAME(ALIAS) decl_type(type) EOS. {
+%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);
 }
+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);
+}
+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);
+}
 
 %type decl {decl*}
+%destructor decl {free_decl($$);}
 decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
 	decl = init_decl(abi, func, args);
 }
 
 %type decl_abi {decl_abi*}
+%destructor decl_abi {free_decl_abi($$);}
 decl_abi(abi) ::= NAME(T). {
 	abi = init_decl_abi(T->text);
 	free(T);
 }
 
 %type decl_var {decl_var*}
+%destructor decl_var {free_decl_var($$);}
 decl_var(var) ::= NAME(T). {
 	var = init_decl_var(T->text, 0, 0);
 	free(T);
@@ -101,13 +134,14 @@ decl_var(var) ::= NAME(T) LBRACKET NUMBER(D) RBRACKET. {
 	free(T);
 	free(D);
 }
-decl_var(var) ::= pointers(p) NAME(T) LBRACKET DIGITS(D) RBRACKET. {
+decl_var(var) ::= pointers(p) NAME(T) LBRACKET NUMBER(D) RBRACKET. {
 	var = init_decl_var(T->text, p+1, atol(D->text));
 	free(T);
 	free(D);
 }
 
 %type decl_vars {decl_vars*}
+%destructor decl_vars {free_decl_vars($$);}
 decl_vars(vars) ::= decl_var(var). {
 	vars = init_decl_vars(var);
 }
@@ -116,11 +150,13 @@ decl_vars(vars) ::= decl_vars(vars_) COMMA decl_var(var). {
 }
 
 %type decl_arg {decl_arg*}
-decl_arg(arg) ::= decl_type(type) decl_var(var). {
-	arg = init_decl_arg(type, var);
+%destructor decl_arg {free_decl_arg($$);}
+decl_arg(arg_) ::= decl_type(type) decl_var(var). {
+	arg_ = var->arg = init_decl_arg(type, var);
 }
 
 %type decl_args {decl_args*}
+%destructor decl_args {free_decl_args($$);}
 decl_args ::= VOID.
 decl_args(args) ::= decl_arg(arg). {
 	args = init_decl_args(arg);
@@ -128,37 +164,35 @@ decl_args(args) ::= decl_arg(arg). {
 decl_args(args) ::= decl_args(args_) COMMA decl_arg(arg). {
 	args = add_decl_arg(args_, arg);
 }
+%type struct_args {decl_args*}
+%destructor struct_args {free_decl_args($$);}
+struct_args(args) ::= decl_arg(arg) EOS. {
+	args = init_decl_args(arg);
+}
+struct_args(args) ::= struct_args(args_) decl_arg(arg) EOS. {
+	args = add_decl_arg(args_, arg);
+}
 
 %type decl_type {decl_type*}
+%destructor decl_type {free_decl_type($$);}
 decl_type(type_) ::= VOID(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= CHAR(T). {
+decl_type(type_) ::= FLOAT(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SHORT(T). {
+decl_type(type_) ::= DOUBLE(T). {
 	type_ = init_decl_type(T->type, T->text);
 	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(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= LONG(T). {
-	type_ = init_decl_type(T->type, T->text);
+	type_ = init_decl_type(PSI_T_NAME, T->text);
 	free(T);
 }
-decl_type(type_) ::= FLOAT(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= DOUBLE(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= SINT8(T). {
+decl_type(type_) ::= INT8(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
@@ -166,7 +200,7 @@ decl_type(type_) ::= UINT8(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SINT16(T). {
+decl_type(type_) ::= INT16(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
@@ -174,7 +208,7 @@ decl_type(type_) ::= UINT16(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SINT32(T). {
+decl_type(type_) ::= INT32(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
@@ -182,7 +216,7 @@ decl_type(type_) ::= UINT32(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SINT64(T). {
+decl_type(type_) ::= INT64(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
@@ -194,6 +228,11 @@ decl_type(type_) ::= NAME(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
+decl_type(type_) ::= STRUCT(S) NAME(T). {
+	type_ = init_decl_type(S->type, T->text);
+	free(S);
+	free(T);
+}
 
 %type impl {impl*}
 %destructor impl {free_impl($$);}
@@ -202,6 +241,7 @@ 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);
@@ -212,28 +252,30 @@ impl_func(func) ::= FUNCTION REFERENCE NSNAME(NAME) impl_args(args) COLON impl_t
 }
 
 %type impl_def_val {impl_def_val*}
+%destructor impl_def_val {free_impl_def_val($$);}
 impl_def_val(def) ::= NULL(T). {
-	def = init_impl_def_val(T);
+	def = init_impl_def_val(T->type, T->text);
 	free(T);
 }
 impl_def_val(def) ::= NUMBER(T). {
-	def = init_impl_def_val(T);
+	def = init_impl_def_val(T->type, T->text);
 	free(T);
 }
 impl_def_val(def) ::= TRUE(T). {
-	def = init_impl_def_val(T);
+	def = init_impl_def_val(T->type, T->text);
 	free(T);
 }
 impl_def_val(def) ::= FALSE(T). {
-	def = init_impl_def_val(T);
+	def = init_impl_def_val(T->type, T->text);
 	free(T);
 }
 impl_def_val(def) ::= QUOTED_STRING(T). {
-	def = init_impl_def_val(T);
+	def = init_impl_def_val(T->type, T->text);
 	free(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);
@@ -244,6 +286,7 @@ impl_var(var) ::= REFERENCE DOLLAR NAME(T). {
 }
 
 %type impl_arg {impl_arg*}
+%destructor impl_arg {free_impl_arg($$);}
 impl_arg(arg) ::= impl_type(type) impl_var(var). {
 	arg = init_impl_arg(type, var, NULL);
 }
@@ -252,6 +295,7 @@ impl_arg(arg) ::= impl_type(type) impl_var(var) EQUALS impl_def_val(def). {
 }
 
 %type impl_args {impl_args*}
+%destructor impl_args {free_impl_args($$);}
 impl_args(args) ::= LPAREN RPAREN. {
 	args = NULL;
 }
@@ -259,6 +303,7 @@ impl_args(args) ::= LPAREN impl_arg_list(args_) RPAREN. {
 	args = args_;
 }
 %type impl_arg_list {impl_args*}
+%destructor impl_arg_list {free_impl_args($$);}
 impl_arg_list(args) ::= impl_arg(arg). {
 	args = init_impl_args(arg);
 }
@@ -291,11 +336,27 @@ impl_stmt(stmt) ::= free_stmt(free). {
 }
 
 %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_stmt(let) ::= LET decl_var(var) EQUALS let_value(val) EOS. {
 	let = init_let_stmt(var, 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);
+}
 let_value(val) ::= let_func(func) LPAREN impl_var(var) RPAREN. {
 	val = init_let_value(func, var, 0);
 }
@@ -310,38 +371,63 @@ let_value(val) ::= NULL. {
 }
 
 %type let_func {let_func*}
+%destructor let_func {free_let_func($$);}
 let_func(func) ::= STRLEN(T). {
-	func = init_let_func(T->type, T->text);
+	func = init_let_func(T->type, T->text, NULL);
 	free(T);
 }
 let_func(func) ::= STRVAL(T). {
-	func = init_let_func(T->type, T->text);
+	func = init_let_func(T->type, T->text, NULL);
 	free(T);
 }
 let_func(func) ::= INTVAL(T). {
-	func = init_let_func(T->type, T->text);
+	func = init_let_func(T->type, T->text, NULL);
 	free(T);
 }
 let_func(func) ::= FLOATVAL(T). {
-	func = init_let_func(T->type, T->text);
+	func = init_let_func(T->type, T->text, NULL);
 	free(T);
 }
 let_func(func) ::= BOOLVAL(T). {
-	func = init_let_func(T->type, T->text);
+	func = init_let_func(T->type, T->text, NULL);
+	free(T);
+}
+let_func(func) ::= ARRVAL(T). {
+	func = init_let_func(T->type, T->text, NULL);
 	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. {
 	set = init_set_stmt(var, val);
 }
 
 %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_vars(vars_) COMMA set_vals(vals) RPAREN. {
+	val = vals;
+	val->func = func_;
+	val->vars = vars_;
+}
+%type set_vals {set_value*}
+%destructor set_vals {free_set_value($$);}
+set_vals(vals) ::= set_value(val). {
+	vals = add_inner_set_value(init_set_value(NULL, NULL), val);
+}
+set_vals(vals) ::= set_vals(vals_) COMMA set_value(val). {
+	vals = add_inner_set_value(vals_, val);
+}
 
 %type set_func {set_func*}
+%destructor set_func {free_set_func($$);}
+set_func(func) ::= TO_ARRAY(T). {
+	func = init_set_func(T->type, T->text);
+	free(T);
+}
 set_func(func) ::= TO_STRING(T). {
 	func = init_set_func(T->type, T->text);
 	free(T);
@@ -364,16 +450,19 @@ set_func(func) ::= VOID(T). {
 }
 
 %type return_stmt {return_stmt*}
-return_stmt(ret) ::= RETURN set_func(func) LPAREN decl_var(var) RPAREN EOS. {
-	ret = init_return_stmt(func, var);
+%destructor return_stmt {free_return_stmt($$);}
+return_stmt(ret) ::= RETURN set_value(val) EOS. {
+	ret = init_return_stmt(val);
 }
 
 %type free_stmt {free_stmt*}
+%destructor free_stmt {free_free_stmt($$);}
 free_stmt(free) ::= FREE decl_vars(vars) EOS. {
 	free = init_free_stmt(vars);
 }
 
 %type impl_type {impl_type*}
+%destructor impl_type {free_impl_type($$);}
 impl_type(type_) ::= VOID(T). {
 	type_ = init_impl_type(T->type, T->text);
 	free(T);