FOREACH -> FOR

src/eberon/EberonRecord.ob

@@ -112,7 +112,7 @@ PROCEDURE ensureMethodDefinitions(r: PRecord; reasons: MapOfMethodIds);
 VAR
     result: ARRAY * OF STRING;
 BEGIN
-    FOREACH v, k IN reasons DO
+    FOR k, v IN reasons DO
         ensureMethodDefinitionsForEach(k, v.ids, r, result);
     END;
     IF LEN(result) # 0 THEN
@@ -159,7 +159,7 @@ END;
 PROCEDURE ensureNonAbstract(r: PRecord);
     PROCEDURE require(declaredMethods: MapOfFields; base: PRecord);
     BEGIN
-        FOREACH v, k IN declaredMethods DO
+        FOR k, v IN declaredMethods DO
             IF ~hasMethodDefinition(r, k) THEN
                 requireMethodDefinition(base, k, cannotInstantiateErrMsg(r^));
             END;
@@ -410,7 +410,7 @@ VAR
     VAR
         result: Strings;
     BEGIN
-        FOREACH v, k IN m DO
+        FOR k, v IN m DO
             result.add(k);
         END;
         RETURN result;
@@ -497,7 +497,7 @@ VAR
     code: STRING;
     result: STRING;
 BEGIN
-    FOREACH f, key IN r.fields DO
+    FOR key, f IN r.fields DO
         type <- f.type()(Types.PStorageType);
         IF key IN r.fieldsInit THEN
             code := r.fieldsInit[key];

src/eberon/eberon_context.js

@@ -166,7 +166,7 @@ var ForEachVariable = TypeNarrowVariable.extend({
     init: function(type){
         TypeNarrowVariable.prototype.init.call(this, type, false, true);
     },
-    idType: function(){return "FOREACH variable";}
+    idType: function(){return "FOR variable";}
 });
 
 var Identdef = Context.Identdef.extend({
@@ -296,8 +296,7 @@ var Designator = Context.Designator.extend({
         else if (s == "POINTER"){
             var typeId = new Type.TypeId(this.handleMessage(getSelfAsPointerMsg));
             var pointerType = new Type.Pointer("", typeId);
-            var info = new SelfAsPointer();
-            this._advance(pointerType, info, "");
+            this._advance(pointerType, new SelfAsPointer(), "");
         }
         else if (s == "SUPER"){
             var ms = this.handleMessage(getMethodSuper);
@@ -1235,16 +1234,16 @@ var ForEach = Context.Chained.extend({
         this.__codeGenerator = CodeGenerator.nullGenerator();
     },
     handleIdent: function(id){
-        if (!this.__valueId)
-            this.__valueId = id;
-        else
-            this.__keyId = id;
+        if (!this.__keyId)
+                this.__keyId = id;
+            else
+                this.__valueId = id;
     },
     codeGenerator: function(){return this.__codeGenerator;},
     handleExpression: function(e){
         var type = e.type();
         if (!(type instanceof EberonMap.Type))
-            throw new Errors.Error("expression of type MAP is expected in FOREACH, got '" 
+            throw new Errors.Error("expression of type MAP is expected in FOR, got '" 
                                  + type.description() + "'");
 
         var scope = EberonScope.makeOperator(

src/eberon/eberon_grammar.js

@@ -25,10 +25,11 @@ function makeStrucType(base, type){
 }
 
 function makeStatement(base, statementSequence, ident, expression){
-    return or(base, 
-              context(and("FOREACH", ident, ",", ident, "IN", expression, "DO", 
-                          statementSequence, required("END", "END expected (FOREACH)")), 
-                      EbContext.ForEach));
+    return or(context(and("FOR", ident, ",", ident, "IN", expression, "DO", 
+                          statementSequence, required("END", "END expected (FOR)")), 
+                      EbContext.ForEach),
+              base
+              );
 }
 
 function makeProcedureHeading(ident, identdef, formalParameters){
@@ -158,7 +159,7 @@ exports.language = {
             Return:             EbContext.Return,
             ModuleDeclaration:  EbContext.ModuleDeclaration
         },
-        Grammar.reservedWords + " SELF SUPER MAP FOREACH"
+        Grammar.reservedWords + " SELF SUPER MAP"
         ),
     stdSymbols: Symbols.makeStd(),
     types: {

src/ob/Code.ob

@@ -279,7 +279,7 @@ PROCEDURE genCommaList(m: StringsMap; import: BOOLEAN): STRING;
 VAR
     result: STRING;
 BEGIN
-    FOREACH alias, name IN m DO;
+    FOR name, alias IN m DO;
         IF LEN(result) # 0 THEN
             result := result + ", ";
         END;
@@ -300,7 +300,7 @@ PROCEDURE ModuleGenerator.epilog(exports: Symbols.Map): STRING;
 VAR
     result: STRING;
 BEGIN
-    FOREACH s, k IN exports DO
+    FOR k, s IN exports DO
         code <- genExport(s^);
         IF LEN(code) # 0 THEN
             IF LEN(result) # 0 THEN

src/ob/Scope.ob

@@ -209,7 +209,7 @@ END;
 
 PROCEDURE defineExports*(VAR m: CompiledModule; exports: Symbols.Map);
 BEGIN
-    FOREACH k, id IN exports DO
+    FOR id, k IN exports DO
         symbol <- k;
         info <- symbol.info();
         IF info IS Types.PVariable THEN

src/ob/Types.ob

@@ -971,7 +971,7 @@ BEGIN
     IF type.base # NIL THEN
         result := dumpRecordFields(type.base);
     END;
-    FOREACH v, k IN type.fields DO
+    FOR k, v IN type.fields DO
         IF LEN(result) # 0 THEN
             result := result + ", ";
         END;

test/input/eberon/map.ob

@@ -25,7 +25,7 @@ PROCEDURE ForEach();
 VAR
     m: MapOfInteger;
 BEGIN
-    FOREACH v, k IN m DO
+    FOR k, v IN m DO
         ASSERT(v = 0);
         ASSERT(k # "");
     END;
@@ -40,7 +40,7 @@ END;
 
 PROCEDURE ForEachWithExpression();
 BEGIN
-    FOREACH v, k IN makeMap() DO
+    FOR k, v IN makeMap() DO
     END;
 END;
 
@@ -50,18 +50,18 @@ VAR
 
     PROCEDURE inner();
     BEGIN
-        FOREACH v, k IN m DO
-            FOREACH v2, k2 IN m DO
+        FOR k, v IN m DO
+            FOR k2, v2 IN m DO
             END;
         END;
     END;
 BEGIN
-    FOREACH v, k IN m DO
-        FOREACH v2, k2 IN m DO
+    FOR k, v IN m DO
+        FOR k2, v2 IN m DO
         END;
     END;
-    FOREACH v3, k3 IN m DO
-        FOREACH v, k IN m DO
+    FOR k3, v3 IN m DO
+        FOR k, v IN m DO
         END;
     END;
 END;
@@ -196,8 +196,8 @@ PROCEDURE passMapArrayElementByRef(VAR a: ARRAY * OF INTEGER);
 END;
 
 BEGIN
-    FOREACH v, k IN m DO
-        FOREACH v2, k2 IN m DO
+    FOR k, v IN m DO
+        FOR k2, v2 IN m DO
         END;
     END;
 

test/input/eberon/run/map.ob

@@ -4,7 +4,7 @@ PROCEDURE testEmptyForEach();
 VAR
     m: MAP OF INTEGER;
 BEGIN
-    FOREACH v, k IN m DO
+    FOR k, v IN m DO
         ASSERT(FALSE);
     END;
 END;
@@ -15,7 +15,7 @@ VAR
 BEGIN
     m["abc"] := 1;
     count <- 0;
-    FOREACH v, k IN m DO
+    FOR k, v IN m DO
         ASSERT(v = 1);
         ASSERT(k = "abc");
         INC(count);

test/test_unit_eberon.js

@@ -1432,29 +1432,29 @@ exports.suite = {
         pass(),
         fail(["PROCEDURE p(m: M); BEGIN m[\"abc\"] := 123; END;", "cannot assign to read-only MAP's element"])
         ),
-    "FOREACH": testWithContext(
+    "FOR": testWithContext(
         context(grammar.statement,
                 "TYPE T = RECORD END;"
               + "VAR m: MAP OF INTEGER; r: T;"),
-        pass("FOREACH v, k IN m DO END",
-             "FOREACH v, k IN m DO ASSERT(k # \"abc\"); END",
-             "FOREACH v, k IN m DO ASSERT(v # 123); END"
+        pass("FOR k, v IN m DO END",
+             "FOR k, v IN m DO ASSERT(k # \"abc\"); END",
+             "FOR k, v IN m DO ASSERT(v # 123); END"
             ),
-        fail(["FOREACH k, k IN m DO END", "'k' already declared"],
-             ["FOREACH m, k IN m DO END", "'m' already declared in module scope"],
-             ["FOREACH v, m IN m DO END", "'m' already declared in module scope"],
-             ["FOREACH v, k IN m DO k := \"\"; END", "cannot assign to FOREACH variable"],
-             ["FOREACH v, k IN m DO v := 0; END", "cannot assign to FOREACH variable"],
-             ["FOREACH v, k IN r DO END", "expression of type MAP is expected in FOREACH, got 'T'"],
-             ["FOREACH v, k IN T DO END", "expression of type MAP is expected in FOREACH, got 'type T'"]
+        fail(["FOR k, k IN m DO END", "'k' already declared"],
+             ["FOR m, v IN m DO END", "'m' already declared in module scope"],
+             ["FOR k, m IN m DO END", "'m' already declared in module scope"],
+             ["FOR k, v IN m DO k := \"\"; END", "cannot assign to FOR variable"],
+             ["FOR k, v IN m DO v := 0; END", "cannot assign to FOR variable"],
+             ["FOR k, v IN r DO END", "expression of type MAP is expected in FOR, got 'T'"],
+             ["FOR k, v IN T DO END", "expression of type MAP is expected in FOR, got 'type T'"]
             )
         ),
-    "FOREACH scope": testWithContext(
+    "FOR scope": testWithContext(
         context(grammar.declarationSequence,
                 "VAR m: MAP OF INTEGER;"),
         pass(),
-        fail(["PROCEDURE p(); BEGIN FOREACH k, v IN m DO END; ASSERT(k # \"abc\"); END;", "undeclared identifier: 'k'"],
-             ["PROCEDURE p(); BEGIN FOREACH k, v IN m DO END; ASSERT(v # 123); END;", "undeclared identifier: 'v'"]
+        fail(["PROCEDURE p(); BEGIN FOR k, v IN m DO END; ASSERT(k # \"abc\"); END;", "undeclared identifier: 'k'"],
+             ["PROCEDURE p(); BEGIN FOR k, v IN m DO END; ASSERT(v # 123); END;", "undeclared identifier: 'v'"]
              )
         ),
     "remove": testWithContext(