--- parser3/src/main/compile.y	2002/01/11 16:53:04	1.173.14.1
+++ parser3/src/main/compile.y	2002/01/31 15:04:38	1.176
@@ -5,7 +5,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.173.14.1 2002/01/11 16:53:04 paf Exp $
+	$Id: compile.y,v 1.176 2002/01/31 15:04:38 paf Exp $
 */
 
 /**
@@ -311,7 +311,9 @@ construct_square: '[' any_constructor_co
 ;
 construct_round: '(' expr_value ')' { 
 	// stack: context, name
-	$$=$2; // stack: context, name, value
+	$$=N(POOL);
+	O($$, OP_PREPARE_TO_CONSTRUCT_EXPR); /* drop change execution state */
+	P($$, $2); // stack: context, name, value
 	O($$, OP_CONSTRUCT_EXPR); /* value=pop->as_expr_result; name=pop; context=pop; construct(context,name,value) */
 }
 ;
@@ -587,10 +589,16 @@ static int yylex(YYSTYPE *lvalp, void *p
 			PC.col++;
 
 		if(c=='@' && PC.col==0+1) {
+			if(PC.ls==LS_DEF_SPECIAL_BODY) {
+				// @SPECIAL
+				// ...
+				// @<here = 
+				pop_LS(PC); // exiting from LS_DEF_SPECIAL_BODY state
+			} // continuing checks
 			if(PC.ls==LS_USER) {
 				push_LS(PC, LS_DEF_NAME);
 				RC;
-			} else // @ in first column inside some code
+			} else // @ in first column inside some code [when could that be?]
 				result=BAD_METHOD_DECL_START;
 			goto break2;
 		} else if(c=='^')
@@ -670,6 +678,7 @@ default:
 			}
 			// fall into COMMENT lexical state [wait for \n]
 			push_LS(PC, LS_COMMENT);
+			continue;
 		}
 		switch(PC.ls) {
 
@@ -787,19 +796,8 @@ default:
 			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) {
-				case '@': case 0: // end of special_code
-					pop_LS(PC);
-					break;
-				}
+			if(c=='\n')
 				RC;
-			}
 			break;
 
 		// (EXPRESSION)