--- parser3/src/main/compile.y 2001/03/30 05:52:17 1.122 +++ parser3/src/main/compile.y 2001/05/07 07:46:43 1.130 @@ -5,7 +5,7 @@ Author: Alexander Petrosyan (http://design.ru/paf) - $Id: compile.y,v 1.122 2001/03/30 05:52:17 paf Exp $ + $Id: compile.y,v 1.130 2001/05/07 07:46:43 paf Exp $ */ /** @@ -29,9 +29,6 @@ #define YYPRINT(file, type, value) yyprint(file, type, value) #include "pa_config_includes.h" -#include -#include -#include #include "compile_tools.h" #include "pa_value.h" @@ -43,10 +40,11 @@ #define SELF_ELEMENT_NAME "self" #define USE_CONTROL_METHOD_NAME "USE" +#define END_CONTROL_METHOD_NAME "end" -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 @@ -85,6 +83,7 @@ int yylex(YYSTYPE *lvalp, void *pc); %token DEF "def" %token IN "in" %token FEXISTS "-f" +%token DEXISTS "-d" %token IS "is" /* logical */ @@ -95,7 +94,7 @@ int yylex(YYSTYPE *lvalp, void *pc); %left "==" "!=" %left "||" %left "&&" -%left "def" "in" "-f" +%left "def" "in" "-f" "-d" %left '!' /* bitwise */ @@ -130,6 +129,8 @@ control_method: '@' STRING '\n' control_strings { const String& command=*LA2S($2); YYSTYPE strings_code=$4; + if(command==END_CONTROL_METHOD_NAME && strings_code->size()==0) + break; if(strings_code->size()<1*2) { strcpy(PC.error, "@"); strcat(PC.error, command.cstr()); @@ -137,7 +138,7 @@ control_method: '@' STRING '\n' YYERROR; } if(command==CLASS_NAME) { - if(PC.cclass!=&PC.request->ROOT) { // already changed from default? + if(PC.cclass!=&PC.request->OP) { // already changed from default? strcpy(PC.error, "class already have a name '"); strncat(PC.error, PC.cclass->name().cstr(), 100); strcat(PC.error, "'"); @@ -149,52 +150,48 @@ control_method: '@' STRING '\n' // 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); // 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( - PC.request->absolute(*LA2S(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=*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; - } - // @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; } }; control_strings: control_string | control_strings control_string { $$=$1; P($$, $2) }; @@ -347,8 +344,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 + Unknown + STORE_PARAM] + if(Value *value=LA2V(params_code)) // it is OP_VALUE + value? + if(!value->is_defined()) // value is VUnknown? + 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; @@ -359,16 +363,7 @@ store_param: | store_round_param | store_curly_param ; -store_square_param: '[' store_code_param_parts ']' { - YYSTYPE params_code=$2; - if(params_code->size()==3) // probably [] case. [OP_VALUE + Unknown + STORE_PARAM] - if(!LA2V(params_code)->is_defined()) { // value is VUnknown? - $$=N(POOL); // ^zzz[] case. don't append lone empty param. - break; - } - - $$=params_code; -}; +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: @@ -492,6 +487,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) } @@ -583,8 +579,9 @@ static int yylex(YYSTYPE *lvalp, void *p if(c=='^' && PC.ls!=LS_COMMENT && PC.ls!=LS_DEF_COMMENT) switch(*PC.source) { - // escaping: ^^ ^$ ^; ^) ^} ^( ^{ ^" + // escaping: ^^ & co case '^': case '$': case ';': + case '(': case ')': case '[': case ']': case '{': case '}': case '"': @@ -762,11 +759,19 @@ 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 '~': @@ -868,13 +873,14 @@ static int yylex(YYSTYPE *lvalp, void *p case 0: case ' ': case '\t': case '\n': case ';': - case ']': case '}': case ')': 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 ',': pop_LS(PC); PC.source--; if(--PC.col<0) { PC.line--; PC.col=-1; } result=EON;