--- parser3/src/main/compile.y	2001/07/09 16:13:17	1.146
+++ parser3/src/main/compile.y	2001/07/25 08:16:21	1.149
@@ -6,7 +6,7 @@
 	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
 */
 %{
-static char *RCSId="$Id: compile.y,v 1.146 2001/07/09 16:13:17 parser Exp $"; 
+static char *RCSId="$Id: compile.y,v 1.149 2001/07/25 08:16:21 parser Exp $"; 
 
 /**
 	@todo parser4: 
@@ -37,7 +37,6 @@ static char *RCSId="$Id: compile.y,v 1.1
 
 #define SELF_ELEMENT_NAME "self"
 #define USE_CONTROL_METHOD_NAME "USE"
-#define END_CONTROL_METHOD_NAME "end"
 
 static int real_yyerror(parse_control *pc, char *s);
 static void yyprint(FILE *file, int type, YYSTYPE value);
@@ -125,8 +124,6 @@ control_method: '@' STRING '\n'
 				maybe_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());
@@ -237,7 +234,7 @@ maybe_codes: empty | codes;
 
 codes: code | codes code { $$=$1; P($$, $2) };
 code: write_string | action;
-action: get | put | with | call;
+action: get | put | call;
 
 /* get */
 
@@ -307,17 +304,29 @@ name_expr_wdive_root: ':' name_expr_dive
 };
 name_expr_wdive_class: class_prefix name_expr_dive_code { $$=$1; P($$, $2) };
 
-construct: construct_by_code | construct_by_expr;
-construct_by_code: '[' any_constructor_code_value ']' {
-	$$=$2; /* stack: context, name, value */
+construct: 
+	construct_square | 
+	construct_round |
+	construct_curly
+;
+construct_square: '[' any_constructor_code_value ']' {
+	// stack: context, name
+	$$=$2; // stack: context, name, value
 	O($$, OP_CONSTRUCT_VALUE); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
-construct_by_expr: '(' expr_value ')' { 
-	$$=$2; /* stack: context, name, value */
+construct_round: '(' expr_value ')' { 
+	// stack: context, name
+	$$=$2; // stack: context, name, value
 	O($$, OP_CONSTRUCT_EXPR); /* value=pop; name=pop; context=pop; construct(context,name,value) */
 }
 ;
+construct_curly: '{' maybe_codes '}' {
+	// stack: context, name
+	$$=N(POOL); 
+	CCA($$, $2); /* code=pop; name=pop; context=pop; construct(context,name,junction(code)) */
+};
+
 any_constructor_code_value: 
 	unknown_value /* optimized $var[] case */
 |	STRING /* optimized $var[STRING] case */
@@ -455,16 +464,6 @@ class_prefix: STRING ':' {
 };
 
 
-/* with */
-
-with: '$' name_without_curly_rdive '{' maybe_codes '}' {
-	$$=$2;
-	O($$, OP_CREATE_RWPOOL);
-	P($$, $4);
-	O($$, OP_REDUCE_RWPOOL);
-	O($$, OP_WRITE_VALUE);
-};
-
 /* expr */
 
 expr_value: expr {
@@ -733,6 +732,11 @@ static int yylex(YYSTYPE *lvalp, void *p
 			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