--- parser3/src/main/compile.y 2001/07/25 10:12:13 1.150 +++ parser3/src/main/compile.y 2001/07/26 12:25:37 1.155 @@ -6,7 +6,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) */ %{ -static char *RCSId="$Id: compile.y,v 1.150 2001/07/25 10:12:13 parser Exp $"; +static char *RCSId="$Id: compile.y,v 1.155 2001/07/26 12:25:37 parser Exp $"; /** @todo parser4: @@ -103,7 +103,7 @@ static int yylex(YYSTYPE *lvalp, void *p %left NEG /* negation: unary - */ %% -all: +all: one_big_piece { Method& method=*NEW Method(POOL, *main_method_name, @@ -247,7 +247,6 @@ get_name_value: name_without_curly_rdive name_in_curly_rdive: '{' name_without_curly_rdive '}' { $$=$2 }; name_without_curly_rdive: name_without_curly_rdive_read -| name_without_curly_rdive_root | name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(POOL); @@ -264,11 +263,6 @@ name_without_curly_rdive_read: name_with } /* diving code; stack: current context */ }; -name_without_curly_rdive_root: ':' name_without_curly_rdive_code { - $$=N(POOL); - O($$, OP_WITH_ROOT); /* stack: starting context */ - P($$, $2); /* diving code; stack: current context */ -}; name_without_curly_rdive_class: class_prefix name_without_curly_rdive_code { $$=$1; P($$, $2) }; name_without_curly_rdive_code: name_advance2 | name_path name_advance2 { $$=$1; P($$, $2) }; @@ -280,7 +274,6 @@ put: '$' name_expr_wdive construct { }; name_expr_wdive: name_expr_wdive_write -| name_expr_wdive_root | name_expr_wdive_class; name_expr_wdive_write: name_expr_dive_code { $$=N(POOL); @@ -297,11 +290,6 @@ name_expr_wdive_write: name_expr_dive_co } /* diving code; stack: current context */ }; -name_expr_wdive_root: ':' name_expr_dive_code { - $$=N(POOL); - O($$, OP_WITH_ROOT); /* stack: starting context */ - P($$, $2); /* diving code; stack: context,name */ -}; name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) }; construct: @@ -328,7 +316,7 @@ construct_curly: '{' maybe_codes '}' { }; any_constructor_code_value: - unknown_value /* optimized $var[] case */ + empty_string_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ | constructor_code_value /* $var[something complex] */ ; @@ -347,11 +335,13 @@ call: call_value { $$=$1; /* stack: value */ O($$, OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ }; -call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */ - $$=$2; /* with_xxx,diving code; stack: context,method_junction */ +call_value: '^' { PC.object_constructor_allowed=true } + call_name { PC.object_constructor_allowed=false } + store_params EON { /* ^field.$method{vasya} */ + $$=$3; /* with_xxx,diving code; stack: context,method_junction */ O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ - YYSTYPE params_code=$3; + YYSTYPE params_code=$5; if(params_code->size()==3) // probably [] case. [OP_VALUE + Void + STORE_PARAM] if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? if(!value->is_defined()) // value is VVoid? @@ -397,7 +387,7 @@ store_curly_param_part: maybe_codes { PCA($$, $1); }; code_param_value: - unknown_value /* optimized [;...] case */ + empty_void_value /* optimized [;...] case */ | STRING /* optimized [STRING] case */ | constructor_code_value /* [something complex] */ ; @@ -441,27 +431,33 @@ name_expr_with_subvar_value: STRING subv P($$, $2); O($$, OP_REDUCE_EWPOOL); }; -subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root; -subvar_ref_name_rdive_read: STRING { +subvar_ref_name_rdive: STRING { $$=N(POOL); O($$, OP_WITH_READ); P($$, $1); }; -subvar_ref_name_rdive_root: ':' STRING { - $$=N(POOL); - O($$, OP_WITH_ROOT); - P($$, $2); -}; subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) }; subvar__get_write: '$' subvar_ref_name_rdive { $$=$2; O($$, OP_GET_ELEMENT__WRITE); }; -class_prefix: STRING ':' { +class_prefix: + class_static_prefix +| class_constructor_prefix +; +class_static_prefix: STRING ':' { $$=$1; // stack: class name string O($$, OP_GET_CLASS); }; +class_constructor_prefix: class_static_prefix ':' { + $$=$1; + if(!PC.object_constructor_allowed) { + strcpy(PC.error, ":: not allowed here"); + YYERROR; + } + O($$, OP_PREPARE_TO_CONSTRUCT_OBJECT); +}; /* expr */ @@ -526,7 +522,8 @@ write_string: STRING { change_string_literal_to_write_string_literal($$=$1) }; -unknown_value: /* empty */ { $$=VL(NEW VString(POOL)) }; +empty_void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; +empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% @@ -635,6 +632,15 @@ static int yylex(YYSTYPE *lvalp, void *p // USER'S = NOT OURS case LS_USER: + if(PC.trim_bof) + switch(c) { + case '\n': case ' ': case '\t': + begin=PC.source; + begin_line=PC.line; + continue; // skip it + default: + PC.trim_bof=false; + } switch(c) { case '$': push_LS(PC, LS_VAR_NAME_SIMPLE);