--- parser3/src/main/compile.y	2001/03/13 14:28:51	1.95
+++ parser3/src/main/compile.y	2001/03/15 09:37:55	1.99
@@ -3,7 +3,7 @@
 	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 
-	$Id: compile.y,v 1.95 2001/03/13 14:28:51 paf Exp $
+	$Id: compile.y,v 1.99 2001/03/15 09:37:55 paf Exp $
 */
 
 /*
@@ -35,10 +35,10 @@
 #include "pa_request.h"
 #include "pa_vobject.h"
 #include "pa_vdouble.h"
-#include "core.h"
+#include "pa_globals.h"
 
 #define SELF_ELEMENT_NAME "self"
-#define USE_CONTROL_METHOD_NAME "use"
+#define USE_CONTROL_METHOD_NAME "USE"
 
 int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -145,7 +145,6 @@ control_method: '@' STRING '\n'
 			// defaulting base. may change with @BASE
 			PC->cclass->set_base(PC->request->root_class);
 			// append to request's classes
-			PC->request->classes_array()+=PC->cclass;
 			PC->request->classes().put(*name, PC->cclass);
 		} else {
 			strcpy(PC->error, "@"CLASS_NAME" must contain sole name");
@@ -809,6 +808,8 @@ int yylex(YYSTYPE *lvalp, void *pc) {
 			case '+': case '*': case '/': case '%': 
 			case '&': case '|': 
 			case '=': case '!':
+			// common delimiters
+			case '\'':
 				pop_LS(PC);
 				PC->source--;  if(--PC->col<0) { PC->line--;  PC->col=-1; }
 				result=EON;