Changeset 233 for branches/xpascal/Generators

Timestamp:

Jun 26, 2023, 6:08:23 PM (17 months ago)

Author:

chronos

Message:

• Added: Support for procedures.
• Added: Project pascal file can be opened from main menu. Last file name is remembered.
• Modified: Improved XML output of source structure.

Location:

branches/xpascal/Generators

Files:

• GeneratorCSharp.pas (modified) (2 diffs)
• GeneratorXml.pas (modified) (5 diffs)

branches/xpascal/Generators/GeneratorCSharp.pas

@@ -227 +227 @@
 
 procedure TGeneratorCSharp.GenerateProgram(Block: TBlock; Prog: TProgram);
-begin
+var
+  MainClass: string;
+begin
+  if Prog.Name <> '' then MainClass := Prog.Name
+    else MainClass := 'App';
   AddTextLine('using System;');
   AddTextLine;
-  AddTextLine('public class ' + Prog.Name);
+  AddTextLine('public class ' + MainClass);
   AddTextLine('{');
   Indent := Indent + 1;
@@ -237 +241 @@
   AddTextLine('public static void Main()');
   AddTextLine('{');
-  AddTextLine('  ' + Prog.Name + ' app = new ' + Prog.Name + '();');
+  AddTextLine('  ' + MainClass + ' app = new ' + MainClass + '();');
   AddTextLine('  app.Entry();');
   AddTextLine('}');

branches/xpascal/Generators/GeneratorXml.pas

@@ -11 +11 @@
   TGeneratorXml = class(TGenerator)
   private
-    procedure GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>);
-    procedure GenerateNode(SourceNode: TSourceNode);
+    procedure GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>;
+      NodeName: string);
+    procedure GenerateNode(SourceNode: TSourceNode; NodeName: string);
   public
     procedure Generate; override;
@@ -26 +27 @@
 { TGeneratorXml }
 
-procedure TGeneratorXml.GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>);
+procedure TGeneratorXml.GenerateNodes(SourceNodes: TSourceNodeList<TSourceNode>;
+  NodeName: string);
 var
   I: Integer;
@@ -32 +34 @@
   for I := 0 to SourceNodes.Count - 1 do begin
     if SourceNodes[I] is TSourceNode then begin
-      GenerateNode(TSourceNode(SourceNodes[I]));
+      GenerateNode(TSourceNode(SourceNodes[I]), NodeName);
     end else raise Exception.Create(SUnsupportedNodeType);
   end;
 end;
 
-procedure TGeneratorXml.GenerateNode(SourceNode: TSourceNode);
+procedure TGeneratorXml.GenerateNode(SourceNode: TSourceNode; NodeName: string);
 var
   I: Integer;
@@ -45 +47 @@
 begin
   if SourceNode is TSourceNode then begin
-    AddTextLine('<' + SourceNode.ClassName + '>');
+    AddTextLine('<' + NodeName + '>');
     Indent := Indent + 1;
     for I := 0 to SourceNode.FieldsCount - 1 do begin
       Field := SourceNode.GetField(I);
-      if Field.DataType = dtObject then begin
-        Obj := SourceNode.GetValueObject(I);
-        if Obj is TSourceNode then
-          GenerateNode(TSourceNode(Obj));
-      end else
-      if Field.DataType = dtList then begin
-        SourceNode.GetValue(I, List);
-        GenerateNodes(List);
-      end else
-      if Field.DataType = dtString then begin
-        AddTextLine('<' + Field.Name + '>' + SourceNode.GetValueString(I) + '<' + Field.Name + '>');
+      try
+        if Field.DataType = dtObject then begin
+          Obj := SourceNode.GetValueObject(I);
+          if Obj is TSourceNode then
+            GenerateNode(TSourceNode(Obj), Field.Name);
+        end else
+        if Field.DataType = dtList then begin
+          SourceNode.GetValue(I, List);
+          if List.Count > 0 then
+            GenerateNodes(List, Field.Name);
+        end else
+        if Field.DataType = dtString then begin
+          if SourceNode.GetValueString(I) <> '' then
+            AddTextLine('<' + Field.Name + '>' + SourceNode.GetValueString(I) +
+              '</' + Field.Name + '>');
+        end;
+      finally
+        Field.Free;
       end;
-      Field.Free;
     end;
     Indent := Indent - 1;
-    AddTextLine('</' + SourceNode.ClassName + '>');
+    AddTextLine('</' + NodeName + '>');
   end else
     raise Exception.Create(SUnsupportedNodeType);
@@ -71 +79 @@
 procedure TGeneratorXml.Generate;
 begin
-  GenerateNode(Prog);
+  AddTextLine('<?xml version="1.0" encoding="UTF-8"?>');
+  GenerateNode(Prog, 'Program');
 end;