--- parser3/src/main/compile.y	2005/12/08 10:02:44	1.217.2.1
+++ parser3/src/main/compile.y	2008/06/25 08:35:51	1.227
@@ -5,7 +5,7 @@
 	Copyright (c) 2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.217.2.1 2005/12/08 10:02:44 paf Exp $
+	$Id: compile.y,v 1.227 2008/06/25 08:35:51 misha Exp $
 */
 
 /**
@@ -41,6 +41,9 @@
 // defines
 
 #define USE_CONTROL_METHOD_NAME "USE"
+#define OPTIONS_CONTROL_METHOD_NAME "OPTIONS"
+#define OPTION_ALL_VARS_LOCAL_NAME "locals"
+#define OPTION_APPEND_METHODS "append"
 
 // forwards
 
@@ -150,21 +153,13 @@ control_method: '@' STRING '\n'
 		YYERROR;
 	}
 	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;
-		}
 		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			// new class' name
 			const String& name=*LA2S(*strings_code);
 			// creating the class
 			VStateless_class* cclass=new VClass;
-			PC.cclass=cclass;
-			PC.cclass->set_name(name);
-			// append to request's classes
-			PC.request.classes().put(name, cclass);
+			PC.cclass_new=cclass;
+			PC.cclass_new->set_name(name);
 		} else {
 			strcpy(PC.error, "@"CLASS_NAME" must contain only one line with class name (contains more then one)");
 			YYERROR;
@@ -173,9 +168,16 @@ control_method: '@' STRING '\n'
 		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE) 
 			PC.request.use_file(PC.request.main_class, *LA2S(*strings_code, i));
 	} else if(command==BASE_NAME) {
+		if(PC.append){
+			strcpy(PC.error, "can't set base while appending methods to class '");
+			strncat(PC.error, PC.cclass->name().cstr(), MAX_STRING/2);
+			strcat(PC.error, "'");
+			YYERROR;
+		}
+		PC.class_add();
 		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);
+			strncat(PC.error, PC.cclass->base_class()->name().cstr(), MAX_STRING/2);
 			strcat(PC.error, "'");
 			YYERROR;
 		}
@@ -203,11 +205,35 @@ control_method: '@' STRING '\n'
 			strcpy(PC.error, "@"BASE_NAME" must contain sole name");
 			YYERROR;
 		}
+	} else if(command==OPTIONS_CONTROL_METHOD_NAME) {
+		for(size_t i=0; i<strings_code->count(); i+=OPERATIONS_PER_OPVALUE) {
+			const String& option=*LA2S(*strings_code, i);
+			if(option==OPTION_ALL_VARS_LOCAL_NAME){
+				PC.set_all_vars_local();
+			} else if(option==OPTION_APPEND_METHODS) {
+				if(!PC.class_reuse()){
+					if(PC.cclass_new){
+						strcpy(PC.error, "can't append methods to '");
+						strncat(PC.error, PC.cclass_new->name().cstr(), MAX_STRING/2);
+						strcat(PC.error, "' - the class doesn't exist");
+					} else {
+						strcpy(PC.error, "'"OPTION_APPEND_METHODS"' option should be used straight after @"CLASS_NAME);
+					}
+					YYERROR;
+				}
+			} else {
+				strcpy(PC.error, "'");
+				strncat(PC.error, option.cstr(), MAX_STRING/2);
+				strcat(PC.error, "' invalid option. valid options are "
+					"'"OPTION_APPEND_METHODS"' and '"OPTION_ALL_VARS_LOCAL_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"'");
+			"'"CLASS_NAME"', '"USE_CONTROL_METHOD_NAME"', '"BASE_NAME"' and '"OPTIONS_CONTROL_METHOD_NAME"'.");
 		YYERROR;
 	}
 };
@@ -217,8 +243,8 @@ control_string: maybe_string '\n';
 maybe_string: empty | STRING;
 
 code_method: '@' STRING bracketed_maybe_strings maybe_bracketed_strings maybe_comment '\n' { 
+	PC.class_add();
 	PC.explicit_result=false;
-	const String& name=*LA2S(*$2);
 
 	YYSTYPE params_names_code=$3;
 	ArrayString* params_names=0;
@@ -230,30 +256,40 @@ code_method: '@' STRING bracketed_maybe_
 
 	YYSTYPE locals_names_code=$4;
 	ArrayString* locals_names=0;
+	bool all_vars_local=false;
 	if(int size=locals_names_code->count()) {
 		locals_names=new ArrayString;
 		for(int i=0; i<size; i+=OPERATIONS_PER_OPVALUE) {
 			const String* local_name=LA2S(*locals_names_code, i);
 			if(*local_name==RESULT_VAR_NAME)
 				PC.explicit_result=true;
+			else if(*local_name==OPTION_ALL_VARS_LOCAL_NAME)
+				all_vars_local=true;
 			else
 				*locals_names+=local_name;
 		}
 	}
+	if(!all_vars_local && PC.cclass && PC.cclass->is_vars_local()){
+		all_vars_local=true;
+	}
 
 	Method* method=new Method(
 		//name, 
 		Method::CT_ANY,
 		0, 0/*min,max numbered_params_count*/, 
 		params_names, locals_names, 
-		0/*to be filled later in next {} */, 0);
-	PC.cclass->add_method(PC.alias_method(name), *method);
+		0/*to be filled later in next {} */, 0, all_vars_local);
+
 	*reinterpret_cast<Method**>(&$$)=method;
 
 	// todo: check [][;result;]
 } maybe_codes {
-	// fill in the code
-	reinterpret_cast<Method*>($7)->parser_code=$8;
+        Method& method=*reinterpret_cast<Method*>($7);
+        // fill in the code
+        method.parser_code=$8;
+        // register in class
+        const String& name=*LA2S(*$2);
+        PC.cclass->add_method(PC.alias_method(name), method);
 };
 
 maybe_bracketed_strings: empty | bracketed_maybe_strings;
@@ -409,7 +445,7 @@ call_value: '^' {
 	YYSTYPE params_code=$5;
 	if(params_code->count()==4) { // probably [] case. [OP_VALUE+origin+Void+STORE_PARAM]
 		if(Value* value=LA2V(*params_code)) // it is OP_VALUE+origin+value?
-			if(!value->is_defined()) // value is VVoid?
+			if(value->is_void()) // value is VVoid?
 				params_code=0; // ^zzz[] case. don't append lone empty param.
 	}
 	/* stack: context, method_junction */
@@ -1073,14 +1109,18 @@ default:
 			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;
+						switch(pc.source[2]){
+						case ' ': case '\t': case '\n': case '"': case '\'': case '^': case '$': // non-quoted string without whitespace after 'def' is not allowed
+							skip_analized=2;
+							result=DEF;
+							goto break2;
+						}
+						// error: incorrect char after 'def'
 					}
 				break;
 			case 't':
 				if(end==begin) // right after whitespace
-					if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // def
+					if(pc.source[0]=='r' && pc.source[1]=='u' && pc.source[2]=='e') { // true
 						skip_analized=3;
 						result=LITERAL_TRUE;
 						goto break2;
@@ -1088,7 +1128,7 @@ default:
 				break;
 			case 'f':
 				if(end==begin) // right after whitespace
-					if(pc.source[0]=='a' && pc.source[1]=='l' && pc.source[2]=='s' && pc.source[3]=='e') { // def
+					if(pc.source[0]=='a' && pc.source[1]=='l' && pc.source[2]=='s' && pc.source[3]=='e') { // false
 						skip_analized=4;
 						result=LITERAL_FALSE;
 						goto break2;
@@ -1170,6 +1210,8 @@ default:
 			case '=': case '!':
 			// common delimiters
 			case ',': case '?': case '#':
+			// mysql column separators
+			case '`':
 			// before call
 			case '^': 
 				pop_LS(pc);