--- parser3/src/main/compile.y 2001/03/24 16:29:09 1.112 +++ parser3/src/main/compile.y 2001/07/25 10:33:05 1.151 @@ -4,9 +4,9 @@ Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: compile.y,v 1.112 2001/03/24 16:29:09 paf Exp $ */ +%{ +static char *RCSId="$Id: compile.y,v 1.151 2001/07/25 10:33:05 parser Exp $"; /** @todo parser4: @@ -19,7 +19,6 @@ -#: in iis make up specialized Pool object for that */ -%{ #define YYSTYPE Array/**/ * #define YYPARSE_PARAM pc #define YYLEX_PARAM pc @@ -28,28 +27,25 @@ #define yyerror(msg) real_yyerror((parse_control *)pc, msg) #define YYPRINT(file, type, value) yyprint(file, type, value) -#include "pa_config_includes.h" -#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_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 @@ -62,6 +58,7 @@ int yylex(YYSTYPE *lvalp, void *pc); %token BOGUS %token BAD_STRING_COMPARISON_OPERATOR +%token BAD_HEX_LITERAL %token LAND "&&" %token LOR "||" @@ -82,22 +79,22 @@ int yylex(YYSTYPE *lvalp, void *pc); %token DEF "def" %token IN "in" %token FEXISTS "-f" +%token DEXISTS "-d" %token IS "is" /* logical */ -%left "is" -%left "lt" "gt" "le" "ge" -%left "eq" "ne" -%left '<' '>' "<=" ">=" "##" -%left "==" "!=" +%left "##" %left "||" %left "&&" -%left "def" "in" "-f" +%left '<' '>' "<=" ">=" "lt" "gt" "le" "ge" +%left "==" "!=" "eq" "ne" +%left "is" "def" "in" "-f" "-d" %left '!' /* bitwise */ %left '#' -%left '&' '|' +%left '|' +%left '&' %left '~' /* numerical */ @@ -110,10 +107,11 @@ all: one_big_piece { Method& method=*NEW Method(POOL, *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(*main_method_name, method); + PC.cclass->add_method(*main_method_name, method); } | methods; @@ -123,90 +121,87 @@ one_big_piece: maybe_codes; method: control_method | code_method; control_method: '@' STRING '\n' - control_strings { - const String& command=*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, command.cstr()); - strcat(PC->error, " is empty"); + strcpy(PC.error, "@"); + strcat(PC.error, command.cstr()); + strcat(PC.error, " is empty"); YYERROR; } if(command==CLASS_NAME) { - if(PC->cclass!=&PC->request->ROOT) { // already changed from default? - strcpy(PC->error, "class already have a name '"); - strncat(PC->error, PC->cclass->name().cstr(), 100); - strcat(PC->error, "'"); + if(PC.cclass->base()) { // already changed from default? + strcpy(PC.error, "class already have a name '"); + strncat(PC.error, PC.cclass->name().cstr(), 100); + strcat(PC.error, "'"); YYERROR; } if(strings_code->size()==1*2) { // new class' name - const String *name=SLA2S(strings_code); + const String *name=LA2S(strings_code); // creating the class - PC->cclass=NEW VClass(POOL); - PC->cclass->set_name(*name); - // defaulting base. may change with @BASE - PC->cclass->set_base(PC->request->ROOT); + PC.cclass=NEW VClass(POOL); + PC.cclass->set_name(*name); // append to request's classes - PC->request->classes().put(*name, PC->cclass); + PC.request->classes().put(*name, PC.cclass); } else { - strcpy(PC->error, "@"CLASS_NAME" must contain sole name"); + 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( - PC->request->absolute(*SLA2S(strings_code, i))); - } else if(command==BASE_NAME) { - if(PC->cclass->base()!=&PC->request->ROOT) { // already changed from default? - strcpy(PC->error, "class already have a base '"); - strncat(PC->error, PC->cclass->base()->name().cstr(), 100); - strcat(PC->error, "'"); + } else if(command==USE_CONTROL_METHOD_NAME) { + for(int i=0; isize(); i+=2) + PC.request->use_file( + PC.request->absolute(*LA2S(strings_code, i))); + } else if(command==BASE_NAME) { + if(PC.cclass->base()) { // already changed from default? + strcpy(PC.error, "class already have a base '"); + strncat(PC.error, PC.cclass->base()->name().cstr(), 100); + strcat(PC.error, "'"); + YYERROR; + } + if(strings_code->size()==1*2) { + const String& base_name=*LA2S(strings_code); + VClass *base=static_cast( + PC.request->classes().get(base_name)); + if(!base) { + strcpy(PC.error, base_name.cstr()); + strcat(PC.error, ": undefined class in @"BASE_NAME); YYERROR; } - if(strings_code->size()==1*2) { - const String& base_name=*SLA2S(strings_code); - VClass *base=static_cast( - PC->request->classes().get(base_name)); - if(!base) { - strcpy(PC->error, base_name.cstr()); - strcat(PC->error, ": undefined class in @"BASE_NAME); - YYERROR; - } - // @CLASS == @BASE sanity check - if(PC->cclass==base) { - strcpy(PC->error, "@"CLASS_NAME" equals @"BASE_NAME); - YYERROR; - } - PC->cclass->set_base(*base); - } else { - strcpy(PC->error, "@"BASE_NAME" must contain sole name"); + // @CLASS == @BASE sanity check + if(PC.cclass==base) { + strcpy(PC.error, "@"CLASS_NAME" equals @"BASE_NAME); YYERROR; } + PC.cclass->set_base(*base); } 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"'"); + 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=0; if(int size=params_names_code->size()) { params_names=NEW Array(POOL); for(int i=0; isize()) { locals_names=NEW Array(POOL); for(int i=0; icclass->add_method(*name, method); + PC.cclass->add_method(*name, method); }; maybe_bracketed_strings: empty | bracketed_maybe_strings; @@ -238,7 +234,7 @@ maybe_codes: empty | codes; codes: code | codes code { $$=$1; P($$, $2) }; code: write_string | action; -action: get | put | with | call; +action: get | put | call; /* get */ @@ -256,7 +252,7 @@ name_without_curly_rdive: name_without_curly_rdive_read: name_without_curly_rdive_code { $$=N(POOL); Array *diving_code=$1; - const String *first_name=SLA2S(diving_code); + const String *first_name=LA2S(diving_code); if(first_name && *first_name==SELF_ELEMENT_NAME) { O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, @@ -289,7 +285,7 @@ name_expr_wdive: name_expr_wdive_write: name_expr_dive_code { $$=N(POOL); Array *diving_code=$1; - const String *first_name=SLA2S(diving_code); + const String *first_name=LA2S(diving_code); if(first_name && *first_name==SELF_ELEMENT_NAME) { O($$, OP_WITH_SELF); /* stack: starting context */ P($$, diving_code, @@ -308,17 +304,29 @@ name_expr_wdive_root: ':' name_expr_dive }; name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) }; -construct: construct_by_code | construct_by_expr; -construct_by_code: '[' any_constructor_code_value ']' { - $$=$2; /* stack: context, name, value */ +construct: + construct_square | + construct_round | + construct_curly +; +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_by_expr: '(' expr_value ')' { - $$=$2; /* stack: context, name, value */ +construct_round: '(' expr_value ')' { + // stack: context, name + $$=$2; // stack: context, name, value O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */ } ; +construct_curly: '{' maybe_codes '}' { + // stack: context, name + $$=N(POOL); + CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */ +}; + any_constructor_code_value: empty_string_value /* optimized $var[] case */ | STRING /* optimized $var[STRING] case */ @@ -342,8 +350,15 @@ call: call_value { call_value: '^' call_name store_params EON { /* ^field.$method{vasya} */ $$=$2; /* with_xxx,diving code; stack: context,method_junction */ O($$, OP_GET_METHOD_FRAME); /* stack: context,method_frame */ - P($$, $3); /* filling method_frame.store_params */ - O($$, OP_CALL); /* method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value */ + + YYSTYPE params_code=$3; + 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. + if(params_code) + P($$, params_code); // filling method_frame.store_params + O($$, OP_CALL); // method_frame=pop; ncontext=pop; call(ncontext,method_frame) stack: value }; call_name: name_without_curly_rdive; @@ -369,17 +384,10 @@ store_curly_param_parts: store_curly_param_part | store_curly_param_parts ';' store_curly_param_part { $$=$1; P($$, $3) } ; -store_code_param_part: - empty /* optimized [] case */ -| STRING { /* optimized [STRING] case */ +store_code_param_part: code_param_value { $$=$1; O($$, OP_STORE_PARAM); -} -| constructor_code_value { /* [something complex] */ - $$=$1; - O($$, OP_STORE_PARAM); -} -; +}; store_expr_param_part: write_expr_value { $$=N(POOL); PEA($$, $1); @@ -388,6 +396,11 @@ store_curly_param_part: maybe_codes { $$=N(POOL); PCA($$, $1); }; +code_param_value: + empty_void_value /* optimized [;...] case */ +| STRING /* optimized [STRING] case */ +| constructor_code_value /* [something complex] */ +; write_expr_value: expr_value { $$=$1; O($$, OP_WRITE_EXPR_RESULT); @@ -451,16 +464,6 @@ class_prefix: STRING ':' { }; -/* with */ - -with: '$' name_without_curly_rdive '{' codes '}' { - $$=$2; - O($$, OP_CREATE_RWPOOL); - P($$, $4); - O($$, OP_REDUCE_RWPOOL); - O($$, OP_WRITE_VALUE); -}; - /* expr */ expr_value: expr { @@ -472,6 +475,7 @@ expr: | 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) } @@ -480,6 +484,7 @@ expr: | "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) } @@ -521,6 +526,7 @@ write_string: STRING { change_string_literal_to_write_string_literal($$=$1) }; +empty_void_value: /* empty */ { $$=VL(NEW VVoid(POOL)) }; empty_string_value: /* empty */ { $$=VL(NEW VString(POOL)) }; empty: /* empty */ { $$=N(POOL) }; @@ -544,64 +550,89 @@ empty: /* empty */ { $$=N(POOL) }; */ static int yylex(YYSTYPE *lvalp, void *pc) { - #define lexical_brackets_nestage PC->brackets_nestages[PC->sp] + #define lexical_brackets_nestage PC.brackets_nestages[PC.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; } - const char *begin=PC->source; + const char *begin=PC.source; const char *end; - int begin_line=PC->line; + int begin_line=PC.line; int skip_analized=0; while(true) { - c=*(end=(PC->source++)); + c=*(end=(PC.source++)); if(c=='\n') { - PC->line++; - PC->col=0; + PC.line++; + PC.col=0; } else - PC->col++; + PC.col++; - // todo: # in 0+1 column comment - - // escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^" - if(c=='^') - switch(*PC->source) { + if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) + switch(*PC.source) { + // escaping: ^^ & co case '^': case '$': case ';': + case '(': case ')': case '[': case ']': case '{': case '}': - case '"': + case '"': if(end!=begin) { // append piece till ^ - PC->string->APPEND(begin, end-begin, PC->file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } // reset piece 'begin' position & line - begin=PC->source; // ^ - begin_line=PC->line; + begin=PC.source; // ^ + begin_line=PC.line; // skip over ^ and _ - PC->source++; PC->col++; + 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; } - if(c=='#' && PC->col==1) { + // #comment start skipping + if(c=='#' && PC.col==1) { if(end!=begin) { // append piece till # - PC->string->APPEND(begin, end-begin, PC->file, begin_line); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line); } - // reset piece 'begin' position & line - begin=PC->source; - begin_line=PC->line; // fall into COMMENT lexical state [wait for \n] push_LS(PC, LS_COMMENT); } - switch(PC->ls) { + switch(PC.ls) { // USER'S = NOT OURS case LS_USER: @@ -613,7 +644,7 @@ static int yylex(YYSTYPE *lvalp, void *p push_LS(PC, LS_METHOD_NAME); RC; case '@': - if(PC->col==0+1) { + if(PC.col==0+1) { push_LS(PC, LS_DEF_NAME); RC; } @@ -625,8 +656,8 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_COMMENT: if(c=='\n') { // skip comment - begin=PC->source; - begin_line=PC->line; + begin=PC.source; + begin_line=PC.line; pop_LS(PC); continue; @@ -634,11 +665,18 @@ static int yylex(YYSTYPE *lvalp, void *p break; // STRING IN EXPRESSION - case LS_EXPRESSION_STRING: + case LS_EXPRESSION_STRING_QUOTED: + case LS_EXPRESSION_STRING_APOSTROFED: switch(c) { case '"': - pop_LS(PC); //"abc". - RC; + 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); RC; @@ -652,10 +690,10 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_DEF_NAME: switch(c) { case '[': - PC->ls=LS_DEF_PARAMS; + PC.ls=LS_DEF_PARAMS; RC; case '\n': - PC->ls=LS_DEF_SPECIAL_BODY; + PC.ls=LS_DEF_SPECIAL_BODY; RC; } break; @@ -665,7 +703,7 @@ static int yylex(YYSTYPE *lvalp, void *p case ';': RC; case ']': - PC->ls=*PC->source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; + PC.ls=*PC.source=='['?LS_DEF_LOCALS:LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out pop_LS(PC); @@ -679,7 +717,7 @@ static int yylex(YYSTYPE *lvalp, void *p case ';': RC; case ']': - PC->ls=LS_DEF_COMMENT; + PC.ls=LS_DEF_COMMENT; RC; case '\n': // wrong. bailing out pop_LS(PC); @@ -695,8 +733,13 @@ static int yylex(YYSTYPE *lvalp, void *p break; case LS_DEF_SPECIAL_BODY: + // @todo in case + // ################ + // @next-method + // we are here with c=='@' + // which is wrong, and need action if(c=='\n') { - switch(*PC->source) { + switch(*PC.source) { case '@': case 0: // end of special_code pop_LS(PC); break; @@ -711,9 +754,9 @@ static int yylex(YYSTYPE *lvalp, void *p 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 + 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 '$': @@ -726,25 +769,33 @@ static int yylex(YYSTYPE *lvalp, void *p lexical_brackets_nestage++; RC; case '-': - if(*PC->source=='f') { // -f + switch(*PC.source) { + case 'f': // -f skip_analized=1; result=FEXISTS; - } else + goto break2; + case 'd': // -d + skip_analized=1; + result=DEXISTS; + goto break2; + default: result=c; + goto break2; + } goto break2; case '+': case '*': case '/': case '%': case '~': case ';': RC; case '&': case '|': case '#': - if(*PC->source==c) { // && || + if(*PC.source==c) { // && || result=c=='#'?LXOR:c=='&'?LAND:LOR; skip_analized=1; } else result=c; goto break2; case '<': case '>': case '=': case '!': - if(*PC->source=='=') { // <= >= == != + if(*PC.source=='=') { // <= >= == != skip_analized=1; switch(c) { case '<': result=NLE; break; @@ -756,37 +807,40 @@ static int yylex(YYSTYPE *lvalp, void *p result=c; goto break2; case '"': - push_LS(PC, LS_EXPRESSION_STRING); + 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 - 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; + 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 - switch(PC->source[0]) { - case 'n': - { // in + if(isspace(PC.source[1])) { + switch(PC.source[0]) { + case 'n': // in skip_analized=1; result=IN; goto break2; - } - case 's': - { // is + case 's': // is skip_analized=1; result=IS; goto break2; @@ -795,7 +849,7 @@ static int yylex(YYSTYPE *lvalp, void *p break; case 'd': if(end==begin) // right after whitespace - if(PC->source[0]=='e' && PC->source[1]=='f') { // def + if(PC.source[0]=='e' && PC.source[1]=='f') { // def skip_analized=2; result=DEF; goto break2; @@ -809,8 +863,8 @@ static int yylex(YYSTYPE *lvalp, void *p // 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; + begin=PC.source; // after whitespace char + begin_line=PC.line; continue; } break; @@ -818,12 +872,23 @@ static int yylex(YYSTYPE *lvalp, void *p // VARIABLE GET/PUT/WITH case LS_VAR_NAME_SIMPLE: case LS_EXPRESSION_VAR_NAME: - if(PC->ls==LS_EXPRESSION_VAR_NAME) { + case LS_VAR_NAME_NO_COLON: + if(PC.ls==LS_EXPRESSION_VAR_NAME) { // name in expr ends also before binary operators switch(c) { 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(PC.ls==LS_VAR_NAME_NO_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; } @@ -832,37 +897,41 @@ static int yylex(YYSTYPE *lvalp, void *p case 0: case ' ': case '\t': case '\n': case ';': - case ']': case '}': case ')': case '"': - case '<': case '>': // these stand for HTML brackets and expression binary ops + 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; case '[': - PC->ls=LS_VAR_SQUARE; + PC.ls=LS_VAR_SQUARE; lexical_brackets_nestage=1; RC; case '{': if(begin==end) { // ${name}, no need of EON, switching LS - PC->ls=LS_VAR_NAME_CURLY; + PC.ls=LS_VAR_NAME_CURLY; } else { - PC->ls=LS_VAR_CURLY; + PC.ls=LS_VAR_CURLY; lexical_brackets_nestage=1; } RC; case '(': - PC->ls=LS_VAR_ROUND; + PC.ls=LS_VAR_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim case '$': // name part subvar case ':': // ':name' or 'class:name' + PC.ls=LS_VAR_NAME_NO_COLON; // stop before next ':' RC; } break; @@ -925,15 +994,15 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_NAME: switch(c) { case '[': - PC->ls=LS_METHOD_SQUARE; + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; case '{': - PC->ls=LS_METHOD_CURLY; + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; case '(': - PC->ls=LS_METHOD_ROUND; + PC.ls=LS_METHOD_ROUND; lexical_brackets_nestage=1; RC; case '.': // name part delim @@ -955,7 +1024,7 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case ']': if(--lexical_brackets_nestage==0) { - PC->ls=LS_METHOD_AFTER; + PC.ls=LS_METHOD_AFTER; RC; } break; @@ -977,7 +1046,7 @@ static int yylex(YYSTYPE *lvalp, void *p RC; case '}': if(--lexical_brackets_nestage==0) { - PC->ls=LS_METHOD_AFTER; + PC.ls=LS_METHOD_AFTER; RC; } break; @@ -989,22 +1058,22 @@ static int yylex(YYSTYPE *lvalp, void *p case LS_METHOD_AFTER: if(c=='[') {/* ][ }[ )[ */ - PC->ls=LS_METHOD_SQUARE; + PC.ls=LS_METHOD_SQUARE; lexical_brackets_nestage=1; RC; } if(c=='{') {/* ]{ }{ ){ */ - PC->ls=LS_METHOD_CURLY; + PC.ls=LS_METHOD_CURLY; lexical_brackets_nestage=1; RC; } if(c=='(') {/* ]( }( )( */ - PC->ls=LS_METHOD_ROUND; + 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; } @@ -1019,32 +1088,34 @@ break2: if((c=='@' || c==0) && end[-1]=='\n') { // we are before LS_DEF_NAME or EOF? // strip last \n end--; + if(end!=begin && end[-1]=='\n') // allow one empty line before LS_DEF_NAME + end--; } - if(end!=begin) { // last piece still alive? + if(end!=begin && PC.ls!=LS_COMMENT) { // last piece still alive and not comment? // append it - PC->string->APPEND(begin, end-begin, PC->file, begin_line/*, start_col*/); + PC.string->APPEND_CLEAN(begin, end-begin, PC.file, begin_line/*, start_col*/); } } - if(PC->string->size()) { // something accumulated? + if(PC.string->size()) { // something accumulated? // create STRING value: array of OP_VALUE+vstring - *lvalp=VL(NEW VString(*PC->string)); + *lvalp=VL(NEW VString(*PC.string)); // new pieces storage - PC->string=NEW String(POOL); + PC.string=NEW String(POOL); // make current result be pending for next call, return STRING for now - PC->pending_state=result; result=STRING; + PC.pending_state=result; result=STRING; } if(skip_analized) { - PC->source+=skip_analized; PC->col+=skip_analized; + PC.source+=skip_analized; PC.col+=skip_analized; } return result; } static int real_yyerror(parse_control *pc, char *s) { // Called by yyparse on error - strncpy(pc->error, s, MAX_STRING); + 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()); + fprintf(file, " \"%s\"", LA2S(value)->cstr()); }