Update demo

Pawe1 · Sep 17, 2014 · a2219a0 · a2219a0
1 parent 126c3fc
commit a2219a0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Demo/uMainForm.dfm b/Demo/uMainForm.dfm
@@ -20,8 +20,6 @@ object Form1: TForm1
     Width = 666
     Height = 389
     Align = alClient
-    Lines.Strings = (
-      'Memo1')
     ScrollBars = ssBoth
     TabOrder = 0
   end

diff --git a/Demo/uMainForm.pas b/Demo/uMainForm.pas
@@ -31,7 +31,6 @@ implementation
 
 function Parse(const Content: string): string;
 var
-  Define: string;
   ASTBuilder: TPasSyntaxTreeBuilder;
   StringStream: TStringStream;
   SyntaxTree: TSyntaxNode;
@@ -44,6 +43,9 @@ function Parse(const Content: string): string;
 
     ASTBuilder := TPasSyntaxTreeBuilder.Create;
     try
+      ASTBuilder.AddDefine('MSWINDOWS');
+      ASTBuilder.AddDefine('WIN32');
+
       SyntaxTree := ASTBuilder.Run(StringStream);
       try
         Result := TSyntaxTreeWriter.ToXML(SyntaxTree);
@@ -61,16 +63,19 @@ function Parse(const Content: string): string;
 procedure TForm1.OpenDelphiUnit1Click(Sender: TObject);
 var
   SL: TStringList;
-  ParserStr: string;
-  Col, Line: Integer;
 begin
   if OpenDialog1.Execute then
   begin
     SL := TStringList.Create;
     try
       SL.LoadFromFile(OpenDialog1.FileName);
 
-      Memo1.Lines.Text := FormatXMLData(Parse(SL.Text));
+      try
+        Memo1.Lines.Text := FormatXMLData(Parse(SL.Text));
+      except
+        on E: EParserException do
+          Memo1.Lines.Add(Format('[%d, %d] %s', [E.Line, E.Col, E.Message]));
+      end;
     finally
       SL.Free;
     end;