projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fliush
[m6w6/ext-psi]
/
src
/
parser_proc.y
diff --git
a/src/parser_proc.y
b/src/parser_proc.y
index f7bec637acac659b4a9dcc7f32e04d1dc0b5956e..d368914f442bd091de8650e35926d4cc4272102c 100644
(file)
--- a/
src/parser_proc.y
+++ b/
src/parser_proc.y
@@
-11,6
+11,7
@@
%token_prefix PSI_T_
%token_type {PSI_Token *}
%token_destructor {free($$);}
%token_prefix PSI_T_
%token_type {PSI_Token *}
%token_destructor {free($$);}
+%default_destructor {(void)P;}
%extra_argument {PSI_Parser *P}
/* TOKEN is defined inside syntax_error */
%syntax_error {
%extra_argument {PSI_Parser *P}
/* TOKEN is defined inside syntax_error */
%syntax_error {
@@
-45,6
+46,14
@@
block ::= decl_typedef(def). {
block ::= constant(constant). {
P->consts = add_constant(P->consts, constant);
}
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*}
+decl_struct(strct) ::= STRUCT NAME(N) LBRACE struct_args(args) RBRACE. {
+ strct = init_decl_struct(N->text, args);
+}
%type const_type {const_type*}
const_type(type_) ::= BOOL(T). {
%type const_type {const_type*}
const_type(type_) ::= BOOL(T). {
@@
-70,10
+79,16
@@
constant(constant) ::= CONST const_type(type) NSNAME(T) EQUALS impl_def_val(val)
}
%type decl_typedef {decl_typedef*}
}
%type decl_typedef {decl_typedef*}
-decl_typedef(def) ::= TYPEDEF
NAME(ALIAS) decl_type(type
) EOS. {
+decl_typedef(def) ::= TYPEDEF
decl_type(type) NAME(ALIAS
) EOS. {
def = init_decl_typedef(ALIAS->text, type);
free(ALIAS);
}
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);
+}
%type decl {decl*}
decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
%type decl {decl*}
decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
@@
-83,17
+98,28
@@
decl(decl) ::= decl_abi(abi) decl_arg(func) LPAREN decl_args(args) RPAREN EOS. {
%type decl_abi {decl_abi*}
decl_abi(abi) ::= NAME(T). {
abi = init_decl_abi(T->text);
%type decl_abi {decl_abi*}
decl_abi(abi) ::= NAME(T). {
abi = init_decl_abi(T->text);
+ free(T);
}
%type decl_var {decl_var*}
decl_var(var) ::= NAME(T). {
}
%type decl_var {decl_var*}
decl_var(var) ::= NAME(T). {
- var = init_decl_var(T->text, 0);
+ var = init_decl_var(T->text, 0
, 0
);
free(T);
}
decl_var(var) ::= pointers(p) NAME(T). {
free(T);
}
decl_var(var) ::= pointers(p) NAME(T). {
- var = init_decl_var(T->text, p);
+ var = init_decl_var(T->text, p
, 0
);
free(T);
}
free(T);
}
+decl_var(var) ::= NAME(T) LBRACKET NUMBER(D) RBRACKET. {
+ var = init_decl_var(T->text, 1, atol(D->text));
+ free(T);
+ free(D);
+}
+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*}
decl_vars(vars) ::= decl_var(var). {
%type decl_vars {decl_vars*}
decl_vars(vars) ::= decl_var(var). {
@@
-116,6
+142,13
@@
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 decl_arg(arg). {
args = add_decl_arg(args_, arg);
}
+%type struct_args {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*}
decl_type(type_) ::= VOID(T). {
%type decl_type {decl_type*}
decl_type(type_) ::= VOID(T). {
@@
-202,18
+235,23
@@
impl_func(func) ::= FUNCTION REFERENCE NSNAME(NAME) impl_args(args) COLON impl_t
%type impl_def_val {impl_def_val*}
impl_def_val(def) ::= NULL(T). {
def = init_impl_def_val(T);
%type impl_def_val {impl_def_val*}
impl_def_val(def) ::= NULL(T). {
def = init_impl_def_val(T);
+ free(T);
}
impl_def_val(def) ::= NUMBER(T). {
def = init_impl_def_val(T);
}
impl_def_val(def) ::= NUMBER(T). {
def = init_impl_def_val(T);
+ free(T);
}
impl_def_val(def) ::= TRUE(T). {
def = init_impl_def_val(T);
}
impl_def_val(def) ::= TRUE(T). {
def = init_impl_def_val(T);
+ free(T);
}
impl_def_val(def) ::= FALSE(T). {
def = init_impl_def_val(T);
}
impl_def_val(def) ::= FALSE(T). {
def = init_impl_def_val(T);
+ free(T);
}
impl_def_val(def) ::= QUOTED_STRING(T). {
def = init_impl_def_val(T);
}
impl_def_val(def) ::= QUOTED_STRING(T). {
def = init_impl_def_val(T);
+ free(T);
}
%type impl_var {impl_var*}
}
%type impl_var {impl_var*}
@@
-274,11
+312,24
@@
impl_stmt(stmt) ::= free_stmt(free). {
}
%type let_stmt {let_stmt*}
}
%type let_stmt {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*}
let_stmt(let) ::= LET decl_var(var) EQUALS let_value(val) EOS. {
let = init_let_stmt(var, val);
}
%type let_value {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,
+ atol(N->text) * psi_t_size(real_decl_type(t)->type)
+ ), NULL, 0
+ );
+ free_decl_type(t);
+ free(F);
+ free(N);
+}
let_value(val) ::= let_func(func) LPAREN impl_var(var) RPAREN. {
val = init_let_value(func, var, 0);
}
let_value(val) ::= let_func(func) LPAREN impl_var(var) RPAREN. {
val = init_let_value(func, var, 0);
}
@@
-294,23
+345,23
@@
let_value(val) ::= NULL. {
%type let_func {let_func*}
let_func(func) ::= STRLEN(T). {
%type let_func {let_func*}
let_func(func) ::= STRLEN(T). {
- func = init_let_func(T->type, T->text);
+ func = init_let_func(T->type, T->text
, 0
);
free(T);
}
let_func(func) ::= STRVAL(T). {
free(T);
}
let_func(func) ::= STRVAL(T). {
- func = init_let_func(T->type, T->text);
+ func = init_let_func(T->type, T->text
, 0
);
free(T);
}
let_func(func) ::= INTVAL(T). {
free(T);
}
let_func(func) ::= INTVAL(T). {
- func = init_let_func(T->type, T->text);
+ func = init_let_func(T->type, T->text
, 0
);
free(T);
}
let_func(func) ::= FLOATVAL(T). {
free(T);
}
let_func(func) ::= FLOATVAL(T). {
- func = init_let_func(T->type, T->text);
+ func = init_let_func(T->type, T->text
, 0
);
free(T);
}
let_func(func) ::= BOOLVAL(T). {
free(T);
}
let_func(func) ::= BOOLVAL(T). {
- func = init_let_func(T->type, T->text);
+ func = init_let_func(T->type, T->text
, 0
);
free(T);
}
free(T);
}
@@
-325,6
+376,10
@@
set_value(val) ::= set_func(func) LPAREN decl_vars(vars) RPAREN. {
}
%type set_func {set_func*}
}
%type set_func {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);
set_func(func) ::= TO_STRING(T). {
func = init_set_func(T->type, T->text);
free(T);