--- parser3/src/main/compile.y 2001/02/25 09:42:04 1.41 +++ parser3/src/main/compile.y 2002/09/20 09:26:32 1.196 @@ -1,38 +1,54 @@ -/* - $Id: compile.y,v 1.41 2001/02/25 09:42:04 paf Exp $ +%{ +/** @file + Parser: compiler(lexical parser and grammar). + + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: compile.y,v 1.196 2002/09/20 09:26:32 paf Exp $ */ -%{ -#define YYSTYPE Array/**/ * +/** + @todo parser4: + - cache compiled code from request to request. to do that... + -#: make method definitions, @CLASS, @BASE, @USE instructions, + which would be executed afterwards, and actions + now performed at compile time would be delayed to run time. + -#: make cache expiration on time and on disk-change of class source + -#: in apache use subpools for compiled class storage + -#: in iis make up specialized Pool object for that +*/ + +#define YYSTYPE Array/**/ * #define YYPARSE_PARAM pc #define YYLEX_PARAM pc #define YYDEBUG 1 -#define YYERROR_VERBOSE +#define YYERROR_VERBOSE 1 #define yyerror(msg) real_yyerror((parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) -#include -#include -#include - #include "compile_tools.h" #include "pa_value.h" #include "pa_request.h" #include "pa_vobject.h" +#include "pa_vdouble.h" +#include "pa_globals.h" +#include "pa_vvoid.h" -#define SELF_NAME "self" -#define USES_NAME "USES" +#define SELF_ELEMENT_NAME "self" +#define USE_CONTROL_METHOD_NAME "USE" -int real_yyerror(parse_control *pc, char *s); +static int real_yyerror(parse_control *pc, char *s); static void yyprint(FILE *file, int type, YYSTYPE value); -int yylex(YYSTYPE *lvalp, void *pc); +static int yylex(YYSTYPE *lvalp, void *pc); // local convinient inplace typecast & var -#define PC ((parse_control *)pc) -#define POOL *PC->pool +#define PC (*(parse_control *)pc) +#define POOL (*PC.pool) #undef NEW #define NEW new(POOL) +#ifndef DOXYGEN %} %pure_parser @@ -41,16 +57,69 @@ int yylex(YYSTYPE *lvalp, void *pc); %token STRING %token BOGUS -%% +%token BAD_STRING_COMPARISON_OPERATOR +%token BAD_HEX_LITERAL +%token BAD_METHOD_DECL_START +%token BAD_METHOD_PARAMETER_NAME_CHARACTER +%token BAD_MATH_OPERATOR_CHARACTER + +%token LAND "&&" +%token LOR "||" +%token LXOR "!||" +%token NXOR "!|" + +%token NLE "<=" +%token NGE ">=" +%token NEQ "==" +%token NNE "!=" +%token NSL "<<" +%token NSR ">>" + +%token SLT "lt" +%token SGT "gt" +%token SLE "le" +%token SGE "ge" +%token SEQ "eq" +%token SNE "ne" + +%token DEF "def" +%token IN "in" +%token FEXISTS "-f" +%token DEXISTS "-d" +%token IS "is" + +/* logical */ +%left "!||" +%left "||" +%left "&&" +%left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" +%left "==" "!=" "eq" "ne" +%left "is" "def" "in" "-f" "-d" +%left '!' + +/* bitwise */ +%left "!|" +%left '|' +%left '&' +%left '~' +%left ">>" +%left "<<" + +/* numerical */ +%left '-' '+' +%left '*' '/' '%' '\\' +%left NEG /* negation: unary - */ +%% all: one_big_piece { - String& name_main=*NEW String(POOL); - name_main.APPEND_CONST(MAIN_METHOD_NAME); - Array& param_names=*NEW Array(POOL); - Array& local_names=*NEW Array(POOL); - Method& method=*NEW Method(POOL, name_main, param_names, local_names, *$1); - PC->vclass->add_method(name_main, method); + Method& method=*NEW Method(POOL, + PC.request->main_method_name, + Method::CT_ANY, + 0, 0, /*min, max numbered_params_count*/ + 0/*param_names*/, 0/*local_names*/, + $1/*parser_code*/, 0/*native_code*/); + PC.cclass->add_method(PC.request->main_method_name, method); } | methods; @@ -60,69 +129,104 @@ one_big_piece: maybe_codes; method: control_method | code_method; control_method: '@' STRING '\n' - control_strings { - String& name=*SLA2S($2); + maybe_control_strings { + const String& command=*LA2S($2); YYSTYPE strings_code=$4; if(strings_code->size()<1*2) { - strcpy(PC->error, "@"); - strcat(PC->error, name.cstr()); - strcat(PC->error, " is empty"); + strcpy(PC.error, "@"); + strcat(PC.error, command.cstr()); + strcat(PC.error, " is empty"); YYERROR; } - if(name==CLASS_NAME) { - if(strings_code->size()==1*2) - PC->vclass->set_name(*SLA2S(strings_code)); - else { - strcpy(PC->error, "@"CLASS_NAME" must contain sole name"); + if(command==CLASS_NAME) { + if(PC.cclass->base_class()) { // already changed from default? + strcpy(PC.error, "class already have a name '"); + strncat(PC.error, PC.cclass->name().cstr(), 100); + strcat(PC.error, "'"); YYERROR; } - } else { - if(name==USES_NAME) { - for(int i=0; isize(); i+=2) { - String *file=SLA2S(strings_code, i); - file->APPEND_CONST(".p"); - PC->request->use(file->cstr(), 0); - } - } else if(name==PARENTS_NAME) { - for(int i=0; isize(); i+=2) { - String& parent_name=*SLA2S(strings_code, i); - VClass *parent=static_cast( - PC->request->classes().get(parent_name)); - if(!parent) { - strcpy(PC->error, parent_name.cstr()); - strcat(PC->error, ": undefined class in @"PARENTS_NAME); - YYERROR; - } - PC->vclass->add_parent(*parent); + if(strings_code->size()==1*2) { + // new class' name + const String *name=LA2S(strings_code); + // creating the class + PC.cclass=NEW VClass(POOL); + PC.cclass->set_name(*name); + // append to request's classes + PC.request->classes().put(*name, PC.cclass); + } else { + strcpy(PC.error, "@"CLASS_NAME" must contain sole name"); + YYERROR; + } + } else if(command==USE_CONTROL_METHOD_NAME) { + for(int i=0; isize(); i+=2) + PC.request->use_file(*LA2S(strings_code, i)); + } else if(command==BASE_NAME) { + if(PC.cclass->base_class()) { // already changed from default? + strcpy(PC.error, "class already have a base '"); + strncat(PC.error, PC.cclass->base_class()->name().cstr(), 100); + strcat(PC.error, "'"); + YYERROR; + } + if(strings_code->size()==1*2) { + const String& base_name=*LA2S(strings_code); + Value *vbase_class=static_cast( + PC.request->classes().get(base_name)); + VStateless_class *base_class=vbase_class?vbase_class->get_class():0; + if(!base_class) { + strcpy(PC.error, base_name.cstr()); + strcat(PC.error, ": undefined class in @"BASE_NAME); + YYERROR; + } + // @CLASS == @BASE sanity check + if(PC.cclass==base_class) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); + YYERROR; } + PC.cclass->set_base(base_class); } else { - strcpy(PC->error, name.cstr()); - strcat(PC->error, ": invalid special name. valid names are " - CLASS_NAME", "USES_NAME" and "PARENTS_NAME); + strcpy(PC.error, "@"BASE_NAME" must contain sole name"); YYERROR; } + } else { + strcpy(PC.error, "'"); + strncat(PC.error, command.cstr(), MAX_STRING/2); + strcat(PC.error, "' invalid special name. valid names are " + "'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"' and '"BASE_NAME"'"); + YYERROR; } }; +maybe_control_strings: empty | control_strings; control_strings: control_string | control_strings control_string { $$=$1; P($$, $2) }; control_string: maybe_string '\n'; maybe_string: empty | STRING; code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' maybe_codes { - const String *name=SLA2S($2); + const String *name=LA2S($2); YYSTYPE params_names_code=$3; - Array& params_names=*NEW Array(POOL); - for(int i=0; isize(); i+=2) - params_names+=SLA2S(params_names_code, i); + Array *params_names=0; + if(int size=params_names_code->size()) { + params_names=NEW Array(POOL); + for(int i=0; isize(); i+=2) - locals_names+=SLA2S(locals_names_code, i); + Array *locals_names=0; + if(int size=locals_names_code->size()) { + locals_names=NEW Array(POOL); + for(int i=0; ivclass->add_method(*name, method); + Method& method=*NEW Method(POOL, + *name, + Method::CT_ANY, + 0, 0/*min,max numbered_params_count*/, + params_names, locals_names, + $7, 0); + PC.cclass->add_method(*name, method); }; maybe_bracketed_strings: empty | bracketed_maybe_strings; @@ -136,160 +240,200 @@ maybe_comment: empty | STRING; maybe_codes: empty | codes; -codes: code | codes code { - $$=$1; - P($$, $2); -}; -code: write_str_literal | action; -action: get | put | with | call; +codes: code | codes code { $$=$1; P($$, $2) }; +code: write_string | action; +action: get | put | call; /* get */ -get: '$' any_name { - $$=$2; /* stack: resulting value */ - OP($$, OP_WRITE); /* value=pop; write(value) */ +get: get_value { + $$=$1; /* stack: resulting value */ + changetail_or_append($$, + OP_GET_ELEMENT, false, /*->*/OP_GET_ELEMENT__WRITE, + /*or */OP_WRITE_VALUE + ); /* value=pop; wcontext.write(value) */ }; - -any_name: name_without_curly_rdive EON | name_in_curly_rdive; - +get_value: '$' get_name_value { $$=$2 }; +get_name_value: name_without_curly_rdive EON | name_in_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: + name_without_curly_rdive_read +| name_without_curly_rdive_class; name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(POOL); Array *diving_code=$1; - String *first_name=SLA2S(diving_code); - if(first_name && *first_name==SELF_NAME) { - OP($$, OP_WITH_SELF); /* stack: starting context */ + const String *first_name=LA2S(diving_code); + // self.xxx... -> xxx... + // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + if(first_name && *first_name==SELF_ELEMENT_NAME) { + O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - OP($$, OP_WITH_READ); /* stack: starting context */ + O($$, OP_WITH_READ); /* stack: starting context */ + + // OP_VALUE+string+OP_GET_ELEMENT. -> OP_VALUE+string+...OR_OPERATOR/OR_JUNCTION_EXP. + if(diving_code->size()==3) // ELEMENT without .SUBELEMENT + diving_code->put_int(2, + PC.in_call_value? + OP_GET_ELEMENT_OR_OPERATOR// possibly ^if [search for operator] + :OP_GET_ELEMENT_OR_JUNCTION_EXPAND // possibly $junction [if junction, expand it] + ); + P($$, diving_code); } /* diving code; stack: current context */ }; -name_without_curly_rdive_root: ':' name_without_curly_rdive_code { - $$=N(POOL); - OP($$, 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) }; /* put */ -put: '$' name_expr_wdive '(' constructor_value ')' { +put: '$' name_expr_wdive construct { $$=$2; /* stack: context,name */ - P($$, $4); /* stack: context,name,constructor_value */ - OP($$, OP_CONSTRUCT); /* value=pop; name=pop; context=pop; construct(context,name,value) */ + P($$, $3); /* stack: context,name,constructor_value */ }; -name_expr_wdive: name_expr_wdive_write | name_expr_wdive_root; -name_expr_wdive_write: name_expr_dive_code { - $$=N(POOL); +name_expr_wdive: + name_expr_wdive_root +| name_expr_wdive_write +| name_expr_wdive_class; +name_expr_wdive_root: name_expr_dive_code { + $$=N(POOL); Array *diving_code=$1; - String *first_name=SLA2S(diving_code); - if(first_name && *first_name==SELF_NAME) { - OP($$, OP_WITH_SELF); /* stack: starting context */ + const String *first_name=LA2S(diving_code); + // $self.xxx... -> $xxx... + // OP_VALUE+string+OP_GET_ELEMENT+... -> OP_WITH_SELF+... + if(first_name && *first_name==SELF_ELEMENT_NAME) { + O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, /* skip over... */ - diving_code->size()>2?3/*OP_+string+get_element*/:2/*OP_+string*/); + diving_code->size()>=3?3/*OP_VALUE+string+OP_GET_ELEMENTx*/:2/*OP_+string*/); } else { - OP($$, OP_WITH_WRITE); /* stack: starting context */ + O($$, OP_WITH_ROOT); /* stack: starting context */ P($$, diving_code); } /* diving code; stack: current context */ }; -name_expr_wdive_root: ':' name_expr_dive_code { +name_expr_wdive_write: '.' name_expr_dive_code { $$=N(POOL); - OP($$, OP_WITH_ROOT); /* stack: starting context */ + O($$, OP_WITH_WRITE); /* stack: starting context */ P($$, $2); /* diving code; stack: context,name */ }; +name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) }; -constructor_value: - constructor_one_param_value -| constructor_two_params_value /* $var(=;2*2) $var(%d;2*2) $var(+;1) */ +construct: + construct_square +| construct_round +| construct_curly ; - -constructor_one_param_value: - empty_value /* optimized $var() case */ -| STRING /* optimized $var(STRING) case */ -| complex_constructor_param_value /* $var(something complex) */ +construct_square: '[' any_constructor_code_value ']' { + // stack: context, name + $$=$2; // stack: context, name, value + O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */ +} +; +construct_round: '(' expr_value ')' { + $$=N(POOL); + O($$, OP_PREPARE_TO_EXPRESSION); + // stack: context, name + P($$, $2); // stack: context, name, value + O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */ +} ; -complex_constructor_param_value: complex_constructor_param_body { +construct_curly: '{' maybe_codes '}' { + // stack: context, name $$=N(POOL); - OP($$, OP_CREATE_EWPOOL); /* stack: empty write context */ - P($$, $1); /* some codes to that context */ - OP($$, OP_REDUCE_EWPOOL); /* context=pop; stack: context.value() */ + OA($$, OP_CURLY_CODE__CONSTRUCT, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ }; -complex_constructor_param_body: codes__excluding_sole_str_literal; -codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) }; -constructor_two_params_value: STRING ';' constructor_one_param_value { - char *operator_or_fmt=SLA2S($1)->cstr(); - $$=N(POOL); - P($$, $1); /* stack: ncontext name operator_or_fmt */ - P($$, $3); /* stack: ncontext name operator_or_fmt expr */ - switch(operator_or_fmt[0]) { - case '=': case '%': - OP($$, OP_EXPRESSION_EVAL); - break; - case '+': case '-': case '*': case '/': - OP($$, OP_MODIFY_EVAL); - break; - default: - strcpy(PC->error, "invalid modification operator"); - YYERROR; - } - /* stack: ncontext name value */ +any_constructor_code_value: + void_value /* optimized $var[] case */ +| STRING /* optimized $var[STRING] case */ +| constructor_code_value /* $var[something complex] */ +; +constructor_code_value: constructor_code { + $$=N(POOL); + OA($$, OP_OBJECT_POOL, $1); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ }; +constructor_code: codes__excluding_sole_str_literal; +codes__excluding_sole_str_literal: action | code codes { $$=$1; P($$, $2) }; /* call */ -call: '^' call_name store_params EON { /* ^field.$method{vasya} */ - $$=$2; /* with_xxx,diving code; stack: context,method_name */ - OP($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ - P($$, $3); /* filling method_frame.store_params */ - OP($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) */ -}; - -call_name: name_without_curly_rdive | class_method_name; - -class_method_name: STRING ':' name_advance1 { - String& name=*SLA2S($1); - VClass *vclass=static_cast(PC->request->classes().get(name)); - if(!vclass) { - strcat(PC->error, "'"); - strcat(PC->error, name.cstr()); - strcat(PC->error, "' class is undefined in call"); - YYERROR; +call: call_value { + $$=$1; /* stack: value */ + changetail_or_append($$, + OP_CALL, true, /*->*/ OP_CALL__WRITE, + /*or */OP_WRITE_VALUE); /* value=pop; wcontext.write(value) */ +}; +call_value: '^' { + PC.in_call_value=true; + } + call_name { + PC.in_call_value=false; + } + store_params EON { /* ^field.$method{vasya} */ + $$=$3; /* with_xxx,diving code; stack: context,method_junction */ + + 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? + params_code=0; // ^zzz[] case. don't append lone empty param. } - $$=CL(vclass); - P($$, $3); + /* stack: context, method_junction */ + OA($$, OP_CALL, params_code); // method_frame=make frame(pop junction); ncontext=pop; call(ncontext,method_frame) stack: value }; +call_name: name_without_curly_rdive; + store_params: store_param | store_params store_param { $$=$1; P($$, $2) }; -store_param: store_round_param | store_curly_param; -store_round_param: '(' store_param_parts ')' {$$=$2}; -store_param_parts: - store_param_part -| store_param_parts ';' store_param_part { $$=$1; P($$, $3) } -; -store_curly_param: '{' maybe_codes '}' { - $$=N(POOL); - PCA($$, $2); - OP($$, OP_STORE_PARAM); -}; -store_param_part: - empty /* optimized () case */ -| STRING { /* optimized (STRING) case */ - $$=$1; - OP($$, OP_STORE_PARAM); -} -| complex_constructor_param_value { /* (something complex) */ +store_param: + store_square_param +| store_round_param +| store_curly_param +; +store_square_param: '[' store_code_param_parts ']' {$$=$2}; +store_round_param: '(' store_expr_param_parts ')' {$$=$2}; +store_curly_param: '{' store_curly_param_parts '}' {$$=$2}; +store_code_param_parts: + store_code_param_part +| store_code_param_parts ';' store_code_param_part { $$=$1; P($$, $3) } +; +store_expr_param_parts: + store_expr_param_part +| store_expr_param_parts ';' store_expr_param_part { $$=$1; P($$, $3) } +; +store_curly_param_parts: + store_curly_param_part +| store_curly_param_parts ';' store_curly_param_part { $$=$1; P($$, $3) } +; +store_code_param_part: code_param_value { $$=$1; - OP($$, OP_STORE_PARAM); -} + O($$, OP_STORE_PARAM); +}; +store_expr_param_part: write_expr_value { + $$=N(POOL); + OA($$, OP_EXPR_CODE__STORE_PARAM, $1); +}; +store_curly_param_part: maybe_codes { + $$=N(POOL); + OA($$, OP_CURLY_CODE__STORE_PARAM, $1); +}; +code_param_value: + void_value /* optimized [;...] case */ +| STRING /* optimized [STRING] case */ +| constructor_code_value /* [something complex] */ ; +write_expr_value: expr_value { + $$=N(POOL); + O($$, OP_PREPARE_TO_EXPRESSION); + P($$, $1); + O($$, OP_WRITE_EXPR_RESULT); +}; /* name */ @@ -298,77 +442,154 @@ name_expr_dive_code: name_expr_value | n name_path: name_step | name_path name_step { $$=$1; P($$, $2) }; name_step: name_advance1 '.'; name_advance1: name_expr_value { + // we know that name_advance1 not called from ^xxx context + // so we'll not check for operator call possibility as we do in name_advance2 + /* stack: context */ $$=$1; /* stack: context,name */ - OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ }; name_advance2: name_expr_value { /* stack: context */ $$=$1; /* stack: context,name */ - OP($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ + O($$, OP_GET_ELEMENT); /* name=pop; context=pop; stack: context.get_element(name) */ } | STRING BOGUS ; name_expr_value: STRING /* subname_is_const */ | name_expr_subvar_value /* $subname_is_var_value */ -| name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value[$...] */ +| name_expr_with_subvar_value /* xxx$part_of_subname_is_var_value */ +| name_square_code_value /* [codes] */ ; name_expr_subvar_value: '$' subvar_ref_name_rdive { $$=$2; - OP($$, OP_GET_ELEMENT); + O($$, OP_GET_ELEMENT); }; name_expr_with_subvar_value: STRING subvar_get_writes { + Array *code; + { + change_string_literal_to_write_string_literal(code=$1); + P(code, $2); + } $$=N(POOL); - OP($$, OP_CREATE_EWPOOL); - P($$, $1); - OP($$, OP_WRITE); - P($$, $2); - OP($$, OP_REDUCE_EWPOOL); + OA($$, OP_STRING_POOL, code); }; -subvar_ref_name_rdive: subvar_ref_name_rdive_read | subvar_ref_name_rdive_root; -subvar_ref_name_rdive_read: STRING { +name_square_code_value: '[' codes ']' { $$=N(POOL); - OP($$, OP_WITH_READ); - P($$, $1); + OA($$, OP_OBJECT_POOL, $2); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.value() */ }; -subvar_ref_name_rdive_root: ':' STRING { +subvar_ref_name_rdive: STRING { $$=N(POOL); - OP($$, OP_WITH_ROOT); - P($$, $2); + O($$, OP_WITH_READ); + P($$, $1); }; subvar_get_writes: subvar__get_write | subvar_get_writes subvar__get_write { $$=$1; P($$, $2) }; subvar__get_write: '$' subvar_ref_name_rdive { $$=$2; - OP($$, OP_GET_ELEMENT__WRITE); + O($$, OP_GET_ELEMENT__WRITE); }; +class_prefix: + class_static_prefix +| class_constructor_prefix +; +class_static_prefix: STRING ':' { + $$=$1; // stack: class name string + if(*LA2S($$) == BASE_NAME) { // pseude BASE class + if(VStateless_class *base=PC.cclass->base_class()) { + change_string_literal_value($$, base->name()); + } else { + strcpy(PC.error, "no base class declared"); + YYERROR; + } + } + O($$, OP_GET_CLASS); +}; +class_constructor_prefix: class_static_prefix ':' { + $$=$1; + if(!PC.in_call_value) { + strcpy(PC.error, ":: not allowed here"); + YYERROR; + } + O($$, OP_PREPARE_TO_CONSTRUCT_OBJECT); +}; -/* with */ -with: '$' name_without_curly_rdive '{' codes '}' { - $$=$2; - OP($$, OP_CREATE_RWPOOL); - P($$, $4); - OP($$, OP_REDUCE_RWPOOL); - OP($$, OP_WRITE); +/* expr */ + +expr_value: expr { + // see OP_PREPARE_TO_EXPRESSION!! + if(($$=$1)->size()==2) // only one string literal in there? + change_string_literal_to_double_literal($$); // make that string literal Double +}; +expr: + STRING +| get_value +| call_value +| '"' string_inside_quotes_value '"' { $$ = $2; } +| '\'' string_inside_quotes_value '\'' { $$ = $2; } +| '(' expr ')' { $$ = $2; } +/* stack: operand // stack: @operand */ +| '-' expr %prec NEG { $$=$2; O($$, OP_NEG) } +| '+' expr %prec NEG { $$=$2 } +| '~' expr { $$=$2; O($$, OP_INV) } +| '!' expr { $$=$2; O($$, OP_NOT) } +| "def" expr { $$=$2; O($$, OP_DEF) } +| "in" expr { $$=$2; O($$, OP_IN) } +| "-f" expr { $$=$2; O($$, OP_FEXISTS) } +| "-d" expr { $$=$2; O($$, OP_DEXISTS) } +/* stack: a,b // stack: a@b */ +| expr '-' expr { $$=$1; P($$, $3); O($$, OP_SUB) } +| expr '+' expr { $$=$1; P($$, $3); O($$, OP_ADD) } +| expr '*' expr { $$=$1; P($$, $3); O($$, OP_MUL) } +| expr '/' expr { $$=$1; P($$, $3); O($$, OP_DIV) } +| expr '%' expr { $$=$1; P($$, $3); O($$, OP_MOD) } +| expr '\\' expr { $$=$1; P($$, $3); O($$, OP_INTDIV) } +| expr "<<" expr { $$=$1; P($$, $3); O($$, OP_BIN_SL) } +| expr ">>" expr { $$=$1; P($$, $3); O($$, OP_BIN_SR) } +| expr '&' expr { $$=$1; P($$, $3); O($$, OP_BIN_AND) } +| expr '|' expr { $$=$1; P($$, $3); O($$, OP_BIN_OR) } +| expr "!|" expr { $$=$1; P($$, $3); O($$, OP_BIN_XOR) } +| expr "&&" expr { $$=$1; OA($$, OP_NESTED_CODE, $3); O($$, OP_LOG_AND) } +| expr "||" expr { $$=$1; OA($$, OP_NESTED_CODE, $3); O($$, OP_LOG_OR) } +| expr "!||" expr { $$=$1; P($$, $3); O($$, OP_LOG_XOR) } +| expr '<' expr { $$=$1; P($$, $3); O($$, OP_NUM_LT) } +| expr '>' expr { $$=$1; P($$, $3); O($$, OP_NUM_GT) } +| expr "<=" expr { $$=$1; P($$, $3); O($$, OP_NUM_LE) } +| expr ">=" expr { $$=$1; P($$, $3); O($$, OP_NUM_GE) } +| expr "==" expr { $$=$1; P($$, $3); O($$, OP_NUM_EQ) } +| expr "!=" expr { $$=$1; P($$, $3); O($$, OP_NUM_NE) } +| expr "lt" expr { $$=$1; P($$, $3); O($$, OP_STR_LT) } +| expr "gt" expr { $$=$1; P($$, $3); O($$, OP_STR_GT) } +| expr "le" expr { $$=$1; P($$, $3); O($$, OP_STR_LE) } +| expr "ge" expr { $$=$1; P($$, $3); O($$, OP_STR_GE) } +| expr "eq" expr { $$=$1; P($$, $3); O($$, OP_STR_EQ) } +| expr "ne" expr { $$=$1; P($$, $3); O($$, OP_STR_NE) } +| expr "is" expr { $$=$1; P($$, $3); O($$, OP_IS) } +; + +string_inside_quotes_value: maybe_codes { + $$=N(POOL); + OA($$, OP_STRING_POOL, $1); /* stack: empty write context */ + /* some code that writes to that context */ + /* context=pop; stack: context.get_string() */ }; /* basics */ -write_str_literal: STRING { - if(SLA2S($1)->size()) { - $$=$1; - OP($$, OP_WRITE); - } else { - // optimized case of special end of macro. see yylex - $$=N(POOL); - } +write_string: STRING { + // optimized from OP_STRING+OP_WRITE_VALUE to OP_STRING__WRITE + change_string_literal_to_write_string_literal($$=$1) }; -empty_value: /* empty */ { $$=SL(NEW VString(POOL)) }; + +void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; empty: /* empty */ { $$=N(POOL) }; %% +#endif /* 000$111(2222)00 @@ -386,307 +607,675 @@ empty: /* empty */ { $$=N(POOL) }; 4:[^({]=pop */ -int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC->brackets_nestages[PC->sp] +static int yylex(YYSTYPE *lvalp, void *pc) { + #define lexical_brackets_nestage PC.brackets_nestages[PC.ls_sp] + #define RC {result=c; goto break2; } register int c; int result; - if(PC->pending_state) { - result=PC->pending_state; - PC->pending_state=0; + if(PC.pending_state) { + result=PC.pending_state; + PC.pending_state=0; return result; } - char *begin=PC->source; - char *end; - int begin_line=PC->line; - while(1) { - c=*(end=(PC->source++)); + const char *begin=PC.source; + const char *end; + int begin_line=PC.line; + int skip_analized=0; + while(true) { + c=*(end=(PC.source++)); +// fprintf(stderr, "\nchar: %c %02X; nestage: %d, sp=%d", c, c, lexical_brackets_nestage, PC.sp); if(c=='\n') { - PC->line++; - PC->col=0; + PC.line++; + PC.col=0; } else - PC->col++; + PC.col++; - // escaping: ^^ ^$ ^; ^) ^} ^( ^{ - if(c=='^') { - char next_c=*PC->source; - - if(next_c=='^' || next_c=='$' || next_c==';' || - next_c=='(' || next_c==')' || - next_c=='{' || next_c=='}') { + if(c=='@' && PC.col==0+1) { + if(PC.ls==LS_DEF_SPECIAL_BODY) { + // @SPECIAL + // ... + // @string->APPEND(begin, end-begin, PC->file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } - // reset piece 'start' position & line - begin=PC->source; // ^ - begin_line=PC->line; - // skip over ^ and _ - PC->source++; - // skip analysis = forced literal - continue; + // reset piece 'begin' position & line + end=begin=PC.source; // ^ + begin_line=PC.line; + if(PC.ls==LS_METHOD_AFTER) { + pop_LS(PC); + result=EON; + skip_analized=-1; // return to ^ afterwards to assure it's literality + goto break2; + } else { + // skip over _ after ^ + PC.source++; PC.col++; + // skip analysis = forced literal + continue; + } + + // converting ^#HH into char(hex(HH)) + case '#': + if(end!=begin) { + // append piece till ^ + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + } + // #HH ? + if(PC.source[0]=='#' && PC.source[1] && PC.source[2]) { + char *hex=(char *)POOL.malloc(1); + hex[0]= + hex_value[(unsigned char)PC.source[1]]*0x10+ + hex_value[(unsigned char)PC.source[2]]; + if(hex[0]==0) { + result=BAD_HEX_LITERAL; + goto break2; // wrong hex value[no ^#00 chars allowed]: bail out + } + // append char(hex(HH)) + PC.string->APPEND_CLEAN(hex, 1, PC.file, begin_line); + // skip over ^#HH + PC.source+=3; + PC.col+=3; + // reset piece 'begin' position & line + begin=PC.source; // ^ + begin_line=PC.line; + continue; + } + break; } + break; + } + // #comment start skipping + if(c=='#' && PC.col==1) { + if(end!=begin) { + // append piece till # + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + } + // fall into COMMENT lexical state [wait for \n] + push_LS(PC, LS_USER_COMMENT); + continue; } - switch(PC->ls) { + switch(PC.ls) { // USER'S = NOT OURS case LS_USER: - if(c=='$') { - push_LS(PC, LS_VAR_NAME_SIMPLE); - result=c; - goto break2; - } - if(c=='^') { + case LS_NAME_SQUARE_PART: // name.[here].xxx + 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_WITH_COLON); + RC; + case '^': push_LS(PC, LS_METHOD_NAME); - result=c; - goto break2; + RC; + case ']': + if(PC.ls==LS_NAME_SQUARE_PART) + if(--lexical_brackets_nestage==0) {// $name.[co<]?>de<]?> + pop_LS(PC); // $name.[co<]>de<]!> + RC; + } + break; + case '[': // $name.[co<[>de] + if(PC.ls==LS_NAME_SQUARE_PART) + lexical_brackets_nestage++; + break; } - if(c=='@' && PC->col==0+1) { - result=c; - push_LS(PC, LS_DEF_NAME); - goto break2; + break; + + // #COMMENT + case LS_USER_COMMENT: + if(c=='\n') { + // skip comment + begin=PC.source; + begin_line=PC.line; + + pop_LS(PC); + continue; } + break; + // STRING IN EXPRESSION + case LS_EXPRESSION_STRING_QUOTED: + case LS_EXPRESSION_STRING_APOSTROFED: + switch(c) { + case '"': + case '\'': + if( + PC.ls == LS_EXPRESSION_STRING_QUOTED && c=='"' || + PC.ls == LS_EXPRESSION_STRING_APOSTROFED && c=='\'') { + pop_LS(PC); //"abc". | 'abc'. + RC; + } + break; + case '$': + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); + RC; + case '^': + push_LS(PC, LS_METHOD_NAME); + RC; + } break; // METHOD DEFINITION case LS_DEF_NAME: - if(c=='[') { - result=c; - PC->ls=LS_DEF_PARAMS; - goto break2; - } - if(c=='\n') { - result=c; - PC->ls=LS_SPEC_CODE; - goto break2; + switch(c) { + case '[': + PC.ls=LS_DEF_PARAMS; + RC; + case '\n': + PC.ls=LS_DEF_SPECIAL_BODY; + RC; } break; + case LS_DEF_PARAMS: - if(c==';') { - result=c; - goto break2; - } - if(c==']') { - result=c; - PC->ls=*PC->source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; - goto break2; - } - if(c=='\n') { // wrong. bailing out - result=c; + switch(c) { + case '$': // common error + result=BAD_METHOD_PARAMETER_NAME_CHARACTER; + goto break2; + case ';': + RC; + case ']': + PC.ls=*PC.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; + RC; + case '\n': // wrong. bailing out pop_LS(PC); - goto break2; + RC; } break; + case LS_DEF_LOCALS: - if(c=='[' || c==';') { - result=c; - goto break2; - } - if(c==']') { - result=c; - PC->ls=LS_DEF_COMMENT; - goto break2; - } - if(c=='\n') { // wrong. bailing out - result=c; + switch(c) { + case '[': + case ';': + RC; + case ']': + PC.ls=LS_DEF_COMMENT; + RC; + case '\n': // wrong. bailing out pop_LS(PC); - goto break2; + RC; } break; + case LS_DEF_COMMENT: if(c=='\n') { - result=c; pop_LS(PC); - goto break2; + RC; } break; - case LS_SPEC_CODE: - if(c=='\n') { - result=c; - if(*PC->source=='@' || *PC->source==0) // end of special_code - pop_LS(PC); + case LS_DEF_SPECIAL_BODY: + if(c=='\n') + RC; + break; + + // (EXPRESSION) + case LS_VAR_ROUND: + case LS_METHOD_ROUND: + switch(c) { + case ')': + if(--lexical_brackets_nestage==0) + if(PC.ls==LS_METHOD_ROUND) // method round param ended + PC.ls=LS_METHOD_AFTER; // look for method end + else // PC.ls==LS_VAR_ROUND // variable constructor ended + pop_LS(PC); // return to normal life + RC; + case '#': // comment start skipping + if(end!=begin) { + // append piece till # + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); + } + // fall into COMMENT lexical state [wait for \n] + push_LS(PC, LS_EXPRESSION_COMMENT); + lexical_brackets_nestage=1; + continue; + case '$': + push_LS(PC, LS_EXPRESSION_VAR_NAME_WITH_COLON); + RC; + case '^': + push_LS(PC, LS_METHOD_NAME); + RC; + case '(': + lexical_brackets_nestage++; + RC; + case '-': + switch(*PC.source) { + case 'f': // -f + skip_analized=1; + result=FEXISTS; + goto break2; + case 'd': // -d + skip_analized=1; + result=DEXISTS; + goto break2; + default: // minus + result=c; + goto break2; + } + goto break2; + case '+': case '*': case '/': case '%': case '\\': + case '~': + case ';': + RC; + case '&': case '|': + if(*PC.source==c) { // && || + result=c=='&'?LAND:LOR; + skip_analized=1; + } else + result=c; + goto break2; + case '!': + switch(PC.source[0]) { + case '|': // !| !|| + skip_analized=1; + if(PC.source[1]=='|') { + skip_analized++; + result=LXOR; + } else + result=NXOR; + goto break2; + case '=': // != + skip_analized=1; + result=NNE; + goto break2; + } + RC; + + case '<': // <<, <=, < + switch(*PC.source) { + case '<': // <[<] + skip_analized=1; result=NSL; break; + case '=': // <[=] + skip_analized=1; result=NLE; break; + default: // <[] + result=c; break; + } + goto break2; + case '>': // >>, >=, > + switch(*PC.source) { + case '>': // >[>] + skip_analized=1; result=NSR; break; + case '=': // >[=] + skip_analized=1; result=NGE; break; + default: // >[] + result=c; break; + } goto break2; + case '=': // == + switch(*PC.source) { + case '=': // =[=] + skip_analized=1; result=NEQ; break; + default: // =[] + result=c; break; // not used now + } + goto break2; + + case '"': + push_LS(PC, LS_EXPRESSION_STRING_QUOTED); + RC; + case '\'': + push_LS(PC, LS_EXPRESSION_STRING_APOSTROFED); + RC; + case 'l': case 'g': case 'e': case 'n': + if(end==begin) // right after whitespace + if(isspace(PC.source[1])) { + switch(*PC.source) { + // case '?': // ok [and bad cases, yacc would bark at them] + case 't': // lt gt [et nt] + result=c=='l'?SLT:c=='g'?SGT:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + case 'e': // le ge ne [ee] + result=c=='l'?SLE:c=='g'?SGE:c=='n'?SNE:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + case 'q': // eq [lq gq nq] + result=c=='e'?SEQ:BAD_STRING_COMPARISON_OPERATOR; + skip_analized=1; + goto break2; + } + } + break; + case 'i': + if(end==begin) // right after whitespace + if(isspace(PC.source[1])) { + switch(PC.source[0]) { + case 'n': // in + skip_analized=1; + result=IN; + goto break2; + case 's': // is + skip_analized=1; + result=IS; + goto break2; + } + } + break; + case 'd': + if(end==begin) // right after whitespace + if(PC.source[0]=='e' && PC.source[1]=='f') { // def + skip_analized=2; + result=DEF; + goto break2; + } + break; + case ' ': case '\t': case '\n': + if(end!=begin) { // there were a string after previous operator? + result=0; // return that string + goto break2; + } + // that's a leading|traling space or after-operator-space + // ignoring it + // reset piece 'begin' position & line + begin=PC.source; // after whitespace char + begin_line=PC.line; + continue; + } + break; + case LS_EXPRESSION_COMMENT: + if(c=='(') + lexical_brackets_nestage++; + + switch(*PC.source) { + case '\n': case ')': + if(*PC.source==')') + if(--lexical_brackets_nestage!=0) + continue; + + // skip comment + begin=PC.source; + begin_line=PC.line; + + pop_LS(PC); + continue; } break; // VARIABLE GET/PUT/WITH - case LS_VAR_NAME_SIMPLE: - if(c==0 || - c==' '|| c=='\t' || c=='\n' || - c==')' || c=='}') { + case LS_VAR_NAME_SIMPLE_WITH_COLON: + case LS_VAR_NAME_SIMPLE_WITHOUT_COLON: + case LS_EXPRESSION_VAR_NAME_WITH_COLON: + case LS_EXPRESSION_VAR_NAME_WITHOUT_COLON: + if( + PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { + // name in expr ends also before + switch(c) { + // expression minus + case '-': + // expression integer division + case '\\': + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + result=EON; + goto break2; + } + } + if( + PC.ls==LS_VAR_NAME_SIMPLE_WITHOUT_COLON || + PC.ls==LS_EXPRESSION_VAR_NAME_WITHOUT_COLON) { + // name already has ':', stop before next + switch(c) { + case ':': + pop_LS(PC); + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } + result=EON; + goto break2; + } + } + switch(c) { + case 0: + case ' ': case '\t': case '\n': + case ';': + case ']': case '}': case ')': + case '"': case '\'': + case '<': case '>': // these stand for HTML brackets AND expression binary ops + case '+': case '*': case '/': case '%': + case '&': case '|': + case '=': case '!': + // common delimiters + case ',': case '?': case '#': + // before call + case '^': pop_LS(PC); - PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; - } - if(begin==end && c=='{') { /* ${name}, no need of EON, switching LS */ - PC->ls=LS_VAR_NAME_CURLY; - result=c; - goto break2; - } - if(c=='(') { - PC->ls=LS_VAR_ROUND; + case '[': + // $name.<[>code] + if(PC.col>1/*not first column*/ && ( + end[-1]=='$'/*was start of get*/ || + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } + PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; - result=c; - goto break2; - } - if(c=='{') { - PC->ls=LS_VAR_CURLY; + RC; + case '{': + if(begin==end) { // ${name}, no need of EON, switching LS + PC.ls=LS_VAR_NAME_CURLY; + } else { + PC.ls=LS_VAR_CURLY; + lexical_brackets_nestage=1; + } + + RC; + case '(': + PC.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; - result=c; - goto break2; - } - if(c=='.'/* name part delim */ || - c=='$'/* name part subvar */ || - c==':'/* ':name' or 'class:name' */) { - result=c; - goto break2; + RC; + case '.': // name part delim + case '$': // name part subvar + case ':': // class<:>name + // go to _WITHOUT_COLON state variant... + if(PC.ls==LS_VAR_NAME_SIMPLE_WITH_COLON) + PC.ls=LS_VAR_NAME_SIMPLE_WITHOUT_COLON; + else if(PC.ls==LS_EXPRESSION_VAR_NAME_WITH_COLON) + PC.ls=LS_EXPRESSION_VAR_NAME_WITHOUT_COLON; + // ...stop before next ':' + RC; } break; + case LS_VAR_NAME_CURLY: - if(c=='}') { /* ${name} finished, restoring LS */ + switch(c) { + case '[': + // ${name.<[>code]} + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + case '}': // ${name} finished, restoring LS pop_LS(PC); - result=c; - goto break2; - } - if(c=='.'/* name part delim */ || - c=='$'/*name part subvar*/ || - c==':'/* ':name' or 'class:name' */) { - result=c; - goto break2; + RC; + case '.': // name part delim + case '$': // name part subvar + case ':': // ':name' or 'class:name' + RC; } break; - case LS_VAR_ROUND: - if(c=='$') { - push_LS(PC, LS_VAR_NAME_SIMPLE); - result=c; - goto break2; - } - if(c=='^') { + + case LS_VAR_SQUARE: + switch(c) { + case '$': + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); + RC; + case '^': push_LS(PC, LS_METHOD_NAME); - result=c; - goto break2; - } - if(c==')') { + RC; + case ']': if(--lexical_brackets_nestage==0) { pop_LS(PC); - result=c; - goto break2; + RC; } - } - if(c==';'/* operator_or_fmt;value delim */) { - result=c; - goto break2; - } - if(c=='(') + break; + case ';': // operator_or_fmt;value delim + RC; + case '[': lexical_brackets_nestage++; + break; + } break; + case LS_VAR_CURLY: - if(c=='$') { - push_LS(PC, LS_VAR_NAME_SIMPLE); - result=c; - goto break2; - } - if(c=='^') { + switch(c) { + case '$': + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); + RC; + case '^': push_LS(PC, LS_METHOD_NAME); - result=c; - goto break2; - } - if(c=='}') + RC; + case '}': if(--lexical_brackets_nestage==0) { pop_LS(PC); - result=c; - goto break2; + RC; } - if(c=='{') + break; + case '{': lexical_brackets_nestage++; + break; + } break; // METHOD CALL case LS_METHOD_NAME: - if(c=='(') { - PC->ls=LS_METHOD_ROUND; + switch(c) { + case '[': + // ^name.<[>code].xxx + if(PC.col>1/*not first column*/ && ( + end[-1]=='^'/*was start of call*/ || // never, ^[ is literal... + end[-1]==':'/*was class name delim */ || + end[-1]=='.'/*was name delim */ + )) { + push_LS(PC, LS_NAME_SQUARE_PART); + lexical_brackets_nestage=1; + RC; + } + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; - result=c; - goto break2; - } - if(c=='{') { - PC->ls=LS_METHOD_CURLY; + RC; + case '{': + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; - result=c; - goto break2; - } - if(c=='.'/* name part delim */ || - c=='$'/* name part subvar */ || - c==':'/* ':name' or 'class:name' */) { - result=c; - goto break2; + RC; + case '(': + PC.ls=LS_METHOD_ROUND; + lexical_brackets_nestage=1; + RC; + case '.': // name part delim + case '$': // name part subvar + case ':': // ':name' or 'class:name' + case '^': // ^abc^xxx wrong. bailing out + case ']': case '}': case ')': // ^abc]}) wrong. bailing out + RC; } break; - case LS_METHOD_ROUND: - if(c=='$') { - push_LS(PC, LS_VAR_NAME_SIMPLE); - result=c; - goto break2; - } - if(c=='^') { + + case LS_METHOD_SQUARE: + switch(c) { + case '$': + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); + RC; + case '^': push_LS(PC, LS_METHOD_NAME); - result=c; - goto break2; - } - if(c==';'/* param delim */) { - result=c; - goto break2; - } - if(c==')') + RC; + case ';': // param delim + RC; + case ']': if(--lexical_brackets_nestage==0) { - PC->ls=LS_METHOD_AFTER; - result=c; - goto break2; + PC.ls=LS_METHOD_AFTER; + RC; } - if(c=='(') + break; + case '[': lexical_brackets_nestage++; + break; + } break; + case LS_METHOD_CURLY: - if(c=='$') { - push_LS(PC, LS_VAR_NAME_SIMPLE); - result=c; - goto break2; - } - if(c=='^') { + switch(c) { + case '$': + push_LS(PC, LS_VAR_NAME_SIMPLE_WITH_COLON); + RC; + case '^': push_LS(PC, LS_METHOD_NAME); - result=c; - goto break2; - } - if(c=='}') + RC; + case ';': // param delim + RC; + case '}': if(--lexical_brackets_nestage==0) { - PC->ls=LS_METHOD_AFTER; - result=c; - goto break2; + PC.ls=LS_METHOD_AFTER; + RC; } - if(c=='{') + break; + case '{': lexical_brackets_nestage++; + break; + } break; + case LS_METHOD_AFTER: - if(c=='(') {/* )( }( */ - PC->ls=LS_METHOD_ROUND; + if(c=='[') {/* ][ }[ )[ */ + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; - result=c; - goto break2; + RC; } - if(c=='{') {/* ){ }{ */ - PC->ls=LS_METHOD_CURLY; + if(c=='{') {/* ]{ }{ ){ */ + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; - result=c; - goto break2; + RC; + } + if(c=='(') {/* ]( }( )( */ + PC.ls=LS_METHOD_ROUND; + lexical_brackets_nestage=1; + RC; } pop_LS(PC); - PC->source--; if(--PC->col<0) { PC->line--; PC->col=-1; } + PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON; goto break2; } @@ -697,41 +1286,38 @@ int yylex(YYSTYPE *lvalp, void *pc) { } break2: - if(begin==end) - return result; - else { - PC->pending_state=result; - // strip last \n before LS_DEF_NAME or EOF - if((c=='@' || c==0) && end[-1]=='\n') + if(end!=begin) { // there is last piece? + if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF? + // strip last \n end--; - if(end!=begin) { - // append last piece - PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); + if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME + end--; } + if(end!=begin && PC.ls!=LS_USER_COMMENT) { // last piece still alive and not comment? + // append it + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); + } + } + if(PC.string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=SL(NEW VString(PC->string)); + *lvalp=VL(NEW VString(*PC.string)); // new pieces storage - PC->string=NEW String(POOL); - // go! - return STRING; + PC.string=NEW String(POOL); + // make current result be pending for next call, return STRING for now + PC.pending_state=result; result=STRING; } + if(skip_analized) { + PC.source+=skip_analized; PC.col+=skip_analized; + } + return result; } -int real_yyerror(parse_control *pc, char *s) /* Called by yyparse on error */ - { - //fprintf(stderr, "[%s]\n", s); - - s[MAX_STRING-1]=0; strcpy(pc->error, s); +static int real_yyerror(parse_control *pc, char *s) { // Called by yyparse on error + strncpy(PC.error, s, MAX_STRING); return 1; - } - -static void - yyprint( - FILE *file, - int type, - YYSTYPE value) - { - if(type==STRING) - fprintf(file, " \"%s\"", SLA2S(value)->cstr()); - } +} +static void yyprint(FILE *file, int type, YYSTYPE value) { + if(type==STRING) + fprintf(file, " \"%s\"", LA2S(value)->cstr()); +}