--- parser3/src/main/compile.tab.C	2009/08/01 05:11:40	1.143
+++ parser3/src/main/compile.tab.C	2010/04/28 17:56:22	1.147
@@ -132,7 +132,7 @@
 	Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.tab.C,v 1.143 2009/08/01 05:11:40 misha Exp $
+	$Id: compile.tab.C,v 1.147 2010/04/28 17:56:22 pretender Exp $
 */
 
 /**
@@ -1430,11 +1430,11 @@ yyreduce:
         case 2:
 #line 132 "compile.y"
     {
-	Method& method=*new Method(Method::CT_ANY,
+	Method* method=new Method(Method::CT_ANY,
 		0, 0, /*min, max numbered_params_count*/
 		0/*param_names*/, 0/*local_names*/, 
 		yyvsp[0]/*parser_code*/, 0/*native_code*/);
-	PC.cclass->add_method(PC.alias_method(main_method_name), method);
+	PC.cclass->set_method(PC.alias_method(main_method_name), method);
 ;}
     break;
 
@@ -1480,7 +1480,7 @@ yyreduce:
 		}
 		if(strings_code->count()==1*OPERATIONS_PER_OPVALUE) {
 			const String& base_name=*LA2S(*strings_code);
-			if(Value* base_class_value=PC.request.classes().get(base_name)) {
+			if(Value* base_class_value=PC.request.get_class(base_name)) {
 				// @CLASS == @BASE sanity check
 				if(VStateless_class *base_class=base_class_value->get_class()) {
 					if(PC.cclass==base_class) {
@@ -1595,13 +1595,13 @@ yyreduce:
   case 18:
 #line 292 "compile.y"
     {
-		Method& method=*reinterpret_cast<Method*>(yyvsp[-1]);
+		Method* method=reinterpret_cast<Method*>(yyvsp[-1]);
 		// fill in the code
-		method.parser_code=yyvsp[0];
+		method->parser_code=yyvsp[0];
 
 		// register in class
 		const String& name=*LA2S(*yyvsp[-6]);
-		PC.cclass->add_method(PC.alias_method(name), method);
+		PC.cclass->set_method(PC.alias_method(name), method);
 ;}
     break;
 
@@ -2129,12 +2129,8 @@ yyreduce:
 			YYERROR;
 		}
 	}
-#ifdef OPTIMIZE_BYTECODE_GET_CLASS
 	// optimized OP_VALUE+origin+string+OP_GET_CLASS => OP_VALUE__GET_CLASS+origin+string
 	maybe_change_first_opcode(*yyval, OP::OP_VALUE, OP::OP_VALUE__GET_CLASS)
-#else
-	O(*yyval, OP::OP_GET_CLASS);
-#endif
 ;}
     break;
 
@@ -3167,7 +3163,7 @@ default:
 			case ']': case '}': case ')': 
 			case '"': case '\'':
 			case '<': case '>':  // these stand for HTML brackets AND expression binary ops
-			case '+': case '*': case '/': case '%': 
+			case '+': case '*': case '/': case '\\': case '%': 
 			case '&': case '|': 
 			case '=': case '!':
 			// common delimiters