m3front: Variable.Declare refactor slightly indirect param vs. direct. (

#562) It is nearly identical code, factor it better to reduce repitition.
modula3 · May 31, 2021 · ba5deb3 · ba5deb3
1 parent 9833375
commit ba5deb3
Showing 1 changed file with 15 additions and 29 deletions.
diff --git a/m3-sys/m3front/src/values/Variable.m3 b/m3-sys/m3front/src/values/Variable.m3
@@ -562,6 +562,7 @@ PROCEDURE Declare (t: T): BOOLEAN =
     externName :TEXT := NIL;
     externM3ID := M3ID.NoID;
     typename   := M3ID.NoID;
+    indirect_text := " ";
   BEGIN
     Type.Compile (t.type);
 
@@ -629,36 +630,20 @@ PROCEDURE Declare (t: T): BOOLEAN =
       t.cg_var := CG.Declare_local (t.name, size, align, mtype, typeUID,
                                     t.need_addr, t.up_level, CG.Maybe);
 
-    ELSIF (t.indirect) THEN
-      (* formal passed by reference => param is an address *)
-      t.cg_align := t.align;
-      t.nextTWACGVar := TsWCGVars;  TsWCGVars := t;
-      (* TODO typename *)
-
-      IF debug THEN
-        RTIO.PutText ("Variable.Declare indirect param type:");
-        RTIO.PutRef (t.type);
-        RTIO.PutText (" name:");
-        IF t.name # 0 THEN
-          RTIO.PutText (M3ID.ToText (t.name));
-        END;
-        RTIO.PutText (" typename:");
-        RTIO.PutInt (typename);
-        RTIO.PutText ("\n");
-        RTIO.Flush ();
-      END;
-
-      t.cg_var := CG.Declare_param (t.name, size, align, mtype, typeUID,
-                                    t.need_addr, t.up_level, CG.Maybe);
     ELSE
-      (* simple parameter *)
-      (** align := FindAlignment (align, size); **)
-      t.cg_align := align;
-      t.nextTWACGVar := TsWCGVars;  TsWCGVars := t;
-      Type.Typename (TypeOf (t), typename);
+      (* parameter *)
+      IF (t.indirect) THEN
+        (* formal passed by reference => param is an address *)
+        (* TODO typename *)
+        indirect_text := " indirect "
+      ELSE
+        (* simple parameter *)
+        (** align := FindAlignment (align, size); **)
+        Type.Typename (TypeOf (t), typename);
+      END;
 
       IF debug THEN
-        RTIO.PutText ("Variable.Declare param type:");
+        RTIO.PutText ("Variable.Declare" & indirect_text & "param type:");
         RTIO.PutRef (t.type);
         RTIO.PutText (" name:");
         IF t.name # 0 THEN
@@ -670,8 +655,9 @@ PROCEDURE Declare (t: T): BOOLEAN =
         RTIO.Flush ();
       END;
 
-      t.cg_var := CG.Declare_param (t.name, size, align, mtype, typeUID,
-                                    t.need_addr, t.up_level, CG.Maybe, typename);
+      t.cg_align := t.align;
+      t.nextTWACGVar := TsWCGVars;  TsWCGVars := t;
+      t.cg_var := CG.Declare_param (t.name, size, align, mtype, typeUID, t.need_addr, t.up_level, CG.Maybe, typename);
     END;
 
     RETURN TRUE;