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

diff --git a/src/parser_proc.y b/src/parser_proc.y
index efffcf7..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);
@@ -176,22 +179,6 @@ decl_type(type_) ::= VOID(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= CHAR(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-decl_type(type_) ::= SHORT(T). {
-	type_ = init_decl_type(T->type, T->text);
-	free(T);
-}
-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);
-	free(T);
-}
 decl_type(type_) ::= FLOAT(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
@@ -200,11 +187,12 @@ decl_type(type_) ::= DOUBLE(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
-decl_type(type_) ::= SIZE_T(T). {
-	type_ = init_decl_type(T->type, T->text);
+/* 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);
 }
-decl_type(type_) ::= SINT8(T). {
+decl_type(type_) ::= INT8(T). {
 	type_ = init_decl_type(T->type, T->text);
 	free(T);
 }
@@ -212,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);
 }
@@ -220,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);
 }
@@ -228,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);
 }
@@ -240,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($$);}
@@ -261,23 +254,23 @@ 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);
 }
 
@@ -415,6 +408,19 @@ set_stmt(set) ::= SET impl_var(var) EQUALS set_value(val) EOS. {
 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($$);}
@@ -445,8 +451,8 @@ set_func(func) ::= VOID(T). {
 
 %type return_stmt {return_stmt*}
 %destructor return_stmt {free_return_stmt($$);}
-return_stmt(ret) ::= RETURN set_func(func) LPAREN decl_var(var) RPAREN EOS. {
-	ret = init_return_stmt(func, var);
+return_stmt(ret) ::= RETURN set_value(val) EOS. {
+	ret = init_return_stmt(val);
 }
 
 %type free_stmt {free_stmt*}