Changeset 143

Timestamp:

Jan 16, 2018, 3:40:08 PM (7 years ago)

Author:

chronos

Message:

• Modified: Better line indentation in generator.

Location:

branches/easy compiler

Files:

• USourceCode.pas (modified) (7 diffs)
• USourceGenerator.pas (modified) (7 diffs)

branches/easy compiler/USourceCode.pas

@@ -36 +36 @@
 
   TSourceTypes = class(TObjectList)
+    Parent: TSourceTypes;
     function AddNew(Name: string; ClassType: TSourceValueClass): TSourceType;
     function Search(Name: string): TSourceType;
@@ -50 +51 @@
 
   TSourceVariables = class(TObjectList)
+    Parent: TSourceVariables;
     function AddNew(Name: string; ValueType: TSourceType): TSourceVariable;
     function Search(Name: string): TSourceVariable;
@@ -107 +109 @@
 
   TSourceConstants = class(TObjectList)
+    Parent: TSourceConstants;
     function AddNewString(Value: string; Name: string = ''): TSourceConstant;
     function AddNewInteger(Value: Integer; Name: string = ''): TSourceConstant;
@@ -141 +144 @@
     procedure InitFunctions;
   public
+    Functions: TSourceFunctions;
     Types: TSourceTypes;
     Variables: TSourceVariables;
     Constants: TSourceConstants;
-    Functions: TSourceFunctions;
     Main: TSourceBeginEnd;
     constructor Create;
@@ -186 +189 @@
     Break;
   end;
+  if not Assigned(Result) and Assigned(Parent) then
+    Result := Parent.Search(Name);
 end;
 
@@ -278 +283 @@
     Break;
   end;
+  if not Assigned(Result) and Assigned(Parent) then
+    Result := Parent.Search(Name);
 end;
 
@@ -312 +319 @@
     Break;
   end;
+  if not Assigned(Result) and Assigned(Parent) then
+    Result := Parent.Search(Name);
 end;
 

branches/easy compiler/USourceGenerator.pas

@@ -13 +13 @@
   TSourceGenerator = class
   private
+    Indent: Integer;
     function GenerateBeginEnd(BeginEnd: TSourceBeginEnd): string;
+    function IndentStr: string;
   public
     function Generate(SourceCode: TSourceCode): string;
@@ -27 +29 @@
   I: Integer;
 begin
+  Indent := 0;
   Result := '';
   if SourceCode.Variables.Count > 0 then
-    Result := Result + 'var' + LineEnding;
+    Result := Result + IndentStr + 'var' + LineEnding;
+  Inc(Indent);
   with SourceCode do
   for I := 0 to Variables.Count - 1 do
   with TSourceVariable(Variables[I]) do begin
-    Result := Result + '  ' + Name + ': ';
+    Result := Result + IndentStr + Name + ': ';
     if ValueType.Name = 'String' then
       Result := Result + 'string'
@@ -41 +45 @@
     Result := Result + ';' + LineEnding;
   end;
+  Dec(Indent);
   Result := Result + GenerateBeginEnd(SourceCode.Main) + '.' + LineEnding;
 end;
@@ -46 +51 @@
 function TSourceGenerator.GenerateBeginEnd(BeginEnd: TSourceBeginEnd): string;
 var
-  Output: string;
   Instruction: TSourceInstruction;
   I: Integer;
@@ -68 +72 @@
 
 begin
-  Output := '';
-  Output := Output + 'begin' + LineEnding;
+  Result := '';
+  Result := Result + IndentStr + 'begin' + LineEnding;
+  Inc(Indent);
   with BeginEnd do
   for I := 0 to Instructions.Count - 1 do begin
@@ -76 +81 @@
     with TSourceFunctionCall(Instruction) do begin
       if Name = 'print' then begin
-        Output := Output + '  Write(' + GenerateRef(Parameters[0]) + ');' +
+        Result := Result + IndentStr + 'Write(' + GenerateRef(Parameters[0]) + ');' +
           LineEnding;
       end else
       if Name = 'println' then begin
-        Output := Output + '  WriteLn(' + GenerateRef(Parameters[0]) + ');' +
+        Result := Result + IndentStr + 'WriteLn(' + GenerateRef(Parameters[0]) + ');' +
           LineEnding;
       end else
       if Name = 'assign' then begin
-        Output := Output + '  ' + GenerateRef(Parameters[0]) + ' := ' +
+        Result := Result + IndentStr + GenerateRef(Parameters[0]) + ' := ' +
           GenerateRef(Parameters[1]) + ';' + LineEnding;
       end else
       if Name = 'inputln' then begin
-        Output := Output + '  ReadLn(' + GenerateRef(Parameters[0]) + ');' + LineEnding;
+        Result := Result + IndentStr + 'ReadLn(' + GenerateRef(Parameters[0]) + ');' + LineEnding;
       end else
       if Name = 'increment' then begin
-        Output := Output + '  Inc(' + GenerateRef(Parameters[0]) + ', ' +
+        Result := Result + IndentStr + 'Inc(' + GenerateRef(Parameters[0]) + ', ' +
           GenerateRef(Parameters[1]) + ');' + LineEnding;
       end else
@@ -97 +102 @@
     end else
     if Instruction is TSourceBeginEnd then begin
-      Output := Output + GenerateBeginEnd(TSourceBeginEnd(Instruction)) +
+      Result := Result + GenerateBeginEnd(TSourceBeginEnd(Instruction)) +
         ';' + LineEnding;
     end else
     raise Exception.Create('Unsupported instruction');
   end;
-  Output := Output + 'end';
-  Result := Output;
+  Dec(Indent);
+  Result := Result + IndentStr + 'end';
+end;
+
+function TSourceGenerator.IndentStr: string;
+begin
+  SetLength(Result, Indent * 2);
+  if Indent > 0 then
+    FillChar(Result[1], Indent * 2, ' ');
 end;