Cleaned up a bit

1991-03-13 13:49:56 +00:00
parent 17266fb373
commit 52842cd09a
13 changed files with 112 additions and 177 deletions
--- a/lang/m2/comp/program.g
+++ b/lang/m2/comp/program.g
@@ -123,16 +123,16 @@ import(int local;)
 			  }
 			  else df = GetDefinitionModule(dot.TOK_IDF, 1);
 			}
-	  IMPORT IdentList(&ImportList) ';'
-			{ EnterFromImportList(ImportList, df, FromId); }
-	|
-	  IMPORT IdentList(&ImportList) ';'
-			{ EnterImportList(ImportList,
-					  local,
-					  enclosing(CurrVis)->sc_scope);
-			}
-	]
-			{
+	]?
+	IMPORT IdentList(&ImportList) ';'
+			{ if (FromId) {
+				EnterFromImportList(ImportList, df, FromId);
+			  }
+			  else {
+				EnterImportList(ImportList,
+						local,
+						enclosing(CurrVis)->sc_scope);
+			  }
 			  FreeNode(ImportList);
 			}
 ;