Changeset 15 for branches/Void

Timestamp:

Nov 10, 2009, 9:11:50 AM (15 years ago)

Author:

george

Message:

• Přidáno: Kostra zobrazování strukturálního stromu.
• Upraveno: Zobrazení kódu pomocí SynEditu namísto Memo.

Location:

branches/Void

Files:

• UCompilator.pas (modified) (2 diffs)
• UMainForm.lfm (modified) (5 diffs)
• UMainForm.pas (modified) (8 diffs)
• UModelViewer.pas (added)
• project1.lpi (modified) (11 diffs)
• project1.lpr (modified) (1 diff)

branches/Void/UCompilator.pas

@@ -150 +150 @@
           with TCommand(Commands[Commands.Add(TCommand.Create)]) do begin
             Name := CommandName;
-            Parser.ParseNextToken;
             if Command.Parameters.Count > 0 then begin
+              Parser.ParseNextToken;
               if (Parser.TokenType = ttSymbol) and (Parser.TokenValue = '(') then begin
                 Parser.ParseNextToken;
@@ -227 +227 @@
       end;
       Parser.ParseNextToken;
+      if (Parser.TokenType <> ttSymbol) and (Parser.TokenValue = ';') then
+        DoError('Expected ;');
+      Parser.ParseNextToken;
       if Parser.TokenType <> ttWhiteSpace then DoError('Expected white space');
     end else DoError('Expected identifier');

branches/Void/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 457
-  Height = 525
-  Top = 112
-  Width = 660
+  Left = 259
+  Height = 580
+  Top = 65
+  Width = 760
   Caption = 'Překladač Void'
-  ClientHeight = 525
-  ClientWidth = 660
+  ClientHeight = 580
+  ClientWidth = 760
   OnClose = FormClose
   OnCreate = FormCreate
@@ -12 +12 @@
   OnShow = FormShow
   LCLVersion = '0.9.29'
-  object Memo1: TMemo
-    Left = 9
-    Height = 402
-    Top = 22
-    Width = 279
-    ScrollBars = ssAutoBoth
-    TabOrder = 0
-  end
-  object Memo2: TMemo
-    Left = 296
-    Height = 376
-    Top = 24
-    Width = 260
-    ScrollBars = ssAutoBoth
-    TabOrder = 1
-  end
   object Label1: TLabel
     Left = 8
@@ -50 +34 @@
     Width = 549
     ScrollBars = ssAutoBoth
-    TabOrder = 2
+    TabOrder = 0
   end
   object Label3: TLabel
@@ -63 +47 @@
     Left = 562
     Height = 25
-    Top = 25
+    Top = 24
     Width = 75
     Caption = 'Přeložit'
     OnClick = ButtonCompileClick
-    TabOrder = 3
+    TabOrder = 1
   end
   object ComboBox1: TComboBox
-    Left = 295
+    Left = 648
     Height = 21
-    Top = 404
-    Width = 262
+    Top = 25
+    Width = 80
     ItemHeight = 13
     ItemIndex = 0
@@ -81 +65 @@
     )
     Style = csDropDownList
-    TabOrder = 4
+    TabOrder = 2
     Text = 'Pascal'
   end
+  inline SynEdit1: TSynEdit
+    Left = 8
+    Height = 402
+    Top = 22
+    Width = 280
+    Font.Height = -13
+    Font.Name = 'Courier New'
+    Font.Pitch = fpFixed
+    Font.Quality = fqNonAntialiased
+    ParentColor = False
+    ParentFont = False
+    TabOrder = 3
+    BookMarkOptions.OnChange = nil
+    Gutter.Width = 57
+    Gutter.MouseActions = <    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccAny
+        ClickDir = cdDown
+        Command = 13
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbRight
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 12
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    Highlighter = SynPasSyn1
+    Keystrokes = <    
+      item
+        Command = ecUp
+        ShortCut = 38
+      end    
+      item
+        Command = ecSelUp
+        ShortCut = 8230
+      end    
+      item
+        Command = ecScrollUp
+        ShortCut = 16422
+      end    
+      item
+        Command = ecDown
+        ShortCut = 40
+      end    
+      item
+        Command = ecSelDown
+        ShortCut = 8232
+      end    
+      item
+        Command = ecScrollDown
+        ShortCut = 16424
+      end    
+      item
+        Command = ecLeft
+        ShortCut = 37
+      end    
+      item
+        Command = ecSelLeft
+        ShortCut = 8229
+      end    
+      item
+        Command = ecWordLeft
+        ShortCut = 16421
+      end    
+      item
+        Command = ecSelWordLeft
+        ShortCut = 24613
+      end    
+      item
+        Command = ecRight
+        ShortCut = 39
+      end    
+      item
+        Command = ecSelRight
+        ShortCut = 8231
+      end    
+      item
+        Command = ecWordRight
+        ShortCut = 16423
+      end    
+      item
+        Command = ecSelWordRight
+        ShortCut = 24615
+      end    
+      item
+        Command = ecPageDown
+        ShortCut = 34
+      end    
+      item
+        Command = ecSelPageDown
+        ShortCut = 8226
+      end    
+      item
+        Command = ecPageBottom
+        ShortCut = 16418
+      end    
+      item
+        Command = ecSelPageBottom
+        ShortCut = 24610
+      end    
+      item
+        Command = ecPageUp
+        ShortCut = 33
+      end    
+      item
+        Command = ecSelPageUp
+        ShortCut = 8225
+      end    
+      item
+        Command = ecPageTop
+        ShortCut = 16417
+      end    
+      item
+        Command = ecSelPageTop
+        ShortCut = 24609
+      end    
+      item
+        Command = ecLineStart
+        ShortCut = 36
+      end    
+      item
+        Command = ecSelLineStart
+        ShortCut = 8228
+      end    
+      item
+        Command = ecEditorTop
+        ShortCut = 16420
+      end    
+      item
+        Command = ecSelEditorTop
+        ShortCut = 24612
+      end    
+      item
+        Command = ecLineEnd
+        ShortCut = 35
+      end    
+      item
+        Command = ecSelLineEnd
+        ShortCut = 8227
+      end    
+      item
+        Command = ecEditorBottom
+        ShortCut = 16419
+      end    
+      item
+        Command = ecSelEditorBottom
+        ShortCut = 24611
+      end    
+      item
+        Command = ecToggleMode
+        ShortCut = 45
+      end    
+      item
+        Command = ecCopy
+        ShortCut = 16429
+      end    
+      item
+        Command = ecPaste
+        ShortCut = 8237
+      end    
+      item
+        Command = ecDeleteChar
+        ShortCut = 46
+      end    
+      item
+        Command = ecCut
+        ShortCut = 8238
+      end    
+      item
+        Command = ecDeleteLastChar
+        ShortCut = 8
+      end    
+      item
+        Command = ecDeleteLastChar
+        ShortCut = 8200
+      end    
+      item
+        Command = ecDeleteLastWord
+        ShortCut = 16392
+      end    
+      item
+        Command = ecUndo
+        ShortCut = 32776
+      end    
+      item
+        Command = ecRedo
+        ShortCut = 40968
+      end    
+      item
+        Command = ecLineBreak
+        ShortCut = 13
+      end    
+      item
+        Command = ecSelectAll
+        ShortCut = 16449
+      end    
+      item
+        Command = ecCopy
+        ShortCut = 16451
+      end    
+      item
+        Command = ecBlockIndent
+        ShortCut = 24649
+      end    
+      item
+        Command = ecLineBreak
+        ShortCut = 16461
+      end    
+      item
+        Command = ecInsertLine
+        ShortCut = 16462
+      end    
+      item
+        Command = ecDeleteWord
+        ShortCut = 16468
+      end    
+      item
+        Command = ecBlockUnindent
+        ShortCut = 24661
+      end    
+      item
+        Command = ecPaste
+        ShortCut = 16470
+      end    
+      item
+        Command = ecCut
+        ShortCut = 16472
+      end    
+      item
+        Command = ecDeleteLine
+        ShortCut = 16473
+      end    
+      item
+        Command = ecDeleteEOL
+        ShortCut = 24665
+      end    
+      item
+        Command = ecUndo
+        ShortCut = 16474
+      end    
+      item
+        Command = ecRedo
+        ShortCut = 24666
+      end    
+      item
+        Command = ecGotoMarker0
+        ShortCut = 16432
+      end    
+      item
+        Command = ecGotoMarker1
+        ShortCut = 16433
+      end    
+      item
+        Command = ecGotoMarker2
+        ShortCut = 16434
+      end    
+      item
+        Command = ecGotoMarker3
+        ShortCut = 16435
+      end    
+      item
+        Command = ecGotoMarker4
+        ShortCut = 16436
+      end    
+      item
+        Command = ecGotoMarker5
+        ShortCut = 16437
+      end    
+      item
+        Command = ecGotoMarker6
+        ShortCut = 16438
+      end    
+      item
+        Command = ecGotoMarker7
+        ShortCut = 16439
+      end    
+      item
+        Command = ecGotoMarker8
+        ShortCut = 16440
+      end    
+      item
+        Command = ecGotoMarker9
+        ShortCut = 16441
+      end    
+      item
+        Command = ecSetMarker0
+        ShortCut = 24624
+      end    
+      item
+        Command = ecSetMarker1
+        ShortCut = 24625
+      end    
+      item
+        Command = ecSetMarker2
+        ShortCut = 24626
+      end    
+      item
+        Command = ecSetMarker3
+        ShortCut = 24627
+      end    
+      item
+        Command = ecSetMarker4
+        ShortCut = 24628
+      end    
+      item
+        Command = ecSetMarker5
+        ShortCut = 24629
+      end    
+      item
+        Command = ecSetMarker6
+        ShortCut = 24630
+      end    
+      item
+        Command = ecSetMarker7
+        ShortCut = 24631
+      end    
+      item
+        Command = ecSetMarker8
+        ShortCut = 24632
+      end    
+      item
+        Command = ecSetMarker9
+        ShortCut = 24633
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41009
+      end    
+      item
+        Command = EcFoldLevel2
+        ShortCut = 41010
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41011
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41012
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41013
+      end    
+      item
+        Command = EcFoldLevel6
+        ShortCut = 41014
+      end    
+      item
+        Command = EcFoldLevel7
+        ShortCut = 41015
+      end    
+      item
+        Command = EcFoldLevel8
+        ShortCut = 41016
+      end    
+      item
+        Command = EcFoldLevel9
+        ShortCut = 41017
+      end    
+      item
+        Command = EcFoldLevel0
+        ShortCut = 41008
+      end    
+      item
+        Command = EcFoldCurrent
+        ShortCut = 41005
+      end    
+      item
+        Command = EcUnFoldCurrent
+        ShortCut = 41003
+      end    
+      item
+        Command = EcToggleMarkupWord
+        ShortCut = 32845
+      end    
+      item
+        Command = ecNormalSelect
+        ShortCut = 24654
+      end    
+      item
+        Command = ecColumnSelect
+        ShortCut = 24643
+      end    
+      item
+        Command = ecLineSelect
+        ShortCut = 24652
+      end    
+      item
+        Command = ecTab
+        ShortCut = 9
+      end    
+      item
+        Command = ecShiftTab
+        ShortCut = 8201
+      end    
+      item
+        Command = ecMatchBracket
+        ShortCut = 24642
+      end    
+      item
+        Command = ecColSelUp
+        ShortCut = 40998
+      end    
+      item
+        Command = ecColSelDown
+        ShortCut = 41000
+      end    
+      item
+        Command = ecColSelLeft
+        ShortCut = 40997
+      end    
+      item
+        Command = ecColSelRight
+        ShortCut = 40999
+      end    
+      item
+        Command = ecColSelPageDown
+        ShortCut = 40994
+      end    
+      item
+        Command = ecColSelPageBottom
+        ShortCut = 57378
+      end    
+      item
+        Command = ecColSelPageUp
+        ShortCut = 40993
+      end    
+      item
+        Command = ecColSelPageTop
+        ShortCut = 57377
+      end    
+      item
+        Command = ecColSelLineStart
+        ShortCut = 40996
+      end    
+      item
+        Command = ecColSelLineEnd
+        ShortCut = 40995
+      end    
+      item
+        Command = ecColSelEditorTop
+        ShortCut = 57380
+      end    
+      item
+        Command = ecColSelEditorBottom
+        ShortCut = 57379
+      end>
+    MouseActions = <    
+      item
+        Shift = []
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 1
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssShift]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 1
+        MoveCaret = True
+        Option = 1
+        Priority = 0
+      end    
+      item
+        Shift = [ssAlt]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 3
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssShift, ssAlt]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 3
+        MoveCaret = True
+        Option = 1
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbRight
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 12
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccDouble
+        ClickDir = cdDown
+        Command = 6
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccTriple
+        ClickDir = cdDown
+        Command = 7
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccQuad
+        ClickDir = cdDown
+        Command = 8
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbMiddle
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 10
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssCtrl]
+        ShiftMask = [ssShift, ssAlt, ssCtrl]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 11
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    MouseSelActions = <    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 9
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    Lines.Strings = (
+      'SynEdit1'
+    )
+    BracketHighlightStyle = sbhsBoth
+    inline SynGutterPartList1: TSynGutterPartList
+      object SynGutterMarks1: TSynGutterMarks
+        Width = 23
+      end
+      object SynGutterLineNumber1: TSynGutterLineNumber
+        Width = 17
+        MouseActions = <>
+        MarkupInfo.Background = clBtnFace
+        MarkupInfo.Foreground = clNone
+        DigitCount = 2
+        ShowOnlyLineNumbersMultiplesOf = 1
+        ZeroStart = False
+        LeadingZeros = False
+      end
+      object SynGutterChanges1: TSynGutterChanges
+        Width = 4
+        ModifiedColor = 59900
+        SavedColor = clGreen
+      end
+      object SynGutterSeparator1: TSynGutterSeparator
+        Width = 2
+      end
+      object SynGutterCodeFolding1: TSynGutterCodeFolding
+        MouseActions = <        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbRight
+            ClickCount = ccSingle
+            ClickDir = cdUp
+            Command = 16
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = [ssShift]
+            Button = mbMiddle
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = [ssShift]
+            ShiftMask = [ssShift]
+            Button = mbMiddle
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 1
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 0
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end>
+        MarkupInfo.Background = clNone
+        MarkupInfo.Foreground = clGray
+        MouseActionsExpanded = <        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end>
+        MouseActionsCollapsed = <        
+          item
+            Shift = [ssCtrl]
+            ShiftMask = [ssCtrl]
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 15
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = [ssCtrl]
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 15
+            MoveCaret = False
+            Option = 1
+            Priority = 0
+          end>
+      end
+    end
+  end
+  inline SynEdit2: TSynEdit
+    Left = 296
+    Height = 404
+    Top = 22
+    Width = 258
+    Font.Height = -13
+    Font.Name = 'Courier New'
+    Font.Pitch = fpFixed
+    Font.Quality = fqNonAntialiased
+    ParentColor = False
+    ParentFont = False
+    TabOrder = 4
+    BookMarkOptions.OnChange = nil
+    Gutter.Width = 57
+    Gutter.MouseActions = <    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccAny
+        ClickDir = cdDown
+        Command = 13
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbRight
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 12
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    Keystrokes = <    
+      item
+        Command = ecUp
+        ShortCut = 38
+      end    
+      item
+        Command = ecSelUp
+        ShortCut = 8230
+      end    
+      item
+        Command = ecScrollUp
+        ShortCut = 16422
+      end    
+      item
+        Command = ecDown
+        ShortCut = 40
+      end    
+      item
+        Command = ecSelDown
+        ShortCut = 8232
+      end    
+      item
+        Command = ecScrollDown
+        ShortCut = 16424
+      end    
+      item
+        Command = ecLeft
+        ShortCut = 37
+      end    
+      item
+        Command = ecSelLeft
+        ShortCut = 8229
+      end    
+      item
+        Command = ecWordLeft
+        ShortCut = 16421
+      end    
+      item
+        Command = ecSelWordLeft
+        ShortCut = 24613
+      end    
+      item
+        Command = ecRight
+        ShortCut = 39
+      end    
+      item
+        Command = ecSelRight
+        ShortCut = 8231
+      end    
+      item
+        Command = ecWordRight
+        ShortCut = 16423
+      end    
+      item
+        Command = ecSelWordRight
+        ShortCut = 24615
+      end    
+      item
+        Command = ecPageDown
+        ShortCut = 34
+      end    
+      item
+        Command = ecSelPageDown
+        ShortCut = 8226
+      end    
+      item
+        Command = ecPageBottom
+        ShortCut = 16418
+      end    
+      item
+        Command = ecSelPageBottom
+        ShortCut = 24610
+      end    
+      item
+        Command = ecPageUp
+        ShortCut = 33
+      end    
+      item
+        Command = ecSelPageUp
+        ShortCut = 8225
+      end    
+      item
+        Command = ecPageTop
+        ShortCut = 16417
+      end    
+      item
+        Command = ecSelPageTop
+        ShortCut = 24609
+      end    
+      item
+        Command = ecLineStart
+        ShortCut = 36
+      end    
+      item
+        Command = ecSelLineStart
+        ShortCut = 8228
+      end    
+      item
+        Command = ecEditorTop
+        ShortCut = 16420
+      end    
+      item
+        Command = ecSelEditorTop
+        ShortCut = 24612
+      end    
+      item
+        Command = ecLineEnd
+        ShortCut = 35
+      end    
+      item
+        Command = ecSelLineEnd
+        ShortCut = 8227
+      end    
+      item
+        Command = ecEditorBottom
+        ShortCut = 16419
+      end    
+      item
+        Command = ecSelEditorBottom
+        ShortCut = 24611
+      end    
+      item
+        Command = ecToggleMode
+        ShortCut = 45
+      end    
+      item
+        Command = ecCopy
+        ShortCut = 16429
+      end    
+      item
+        Command = ecPaste
+        ShortCut = 8237
+      end    
+      item
+        Command = ecDeleteChar
+        ShortCut = 46
+      end    
+      item
+        Command = ecCut
+        ShortCut = 8238
+      end    
+      item
+        Command = ecDeleteLastChar
+        ShortCut = 8
+      end    
+      item
+        Command = ecDeleteLastChar
+        ShortCut = 8200
+      end    
+      item
+        Command = ecDeleteLastWord
+        ShortCut = 16392
+      end    
+      item
+        Command = ecUndo
+        ShortCut = 32776
+      end    
+      item
+        Command = ecRedo
+        ShortCut = 40968
+      end    
+      item
+        Command = ecLineBreak
+        ShortCut = 13
+      end    
+      item
+        Command = ecSelectAll
+        ShortCut = 16449
+      end    
+      item
+        Command = ecCopy
+        ShortCut = 16451
+      end    
+      item
+        Command = ecBlockIndent
+        ShortCut = 24649
+      end    
+      item
+        Command = ecLineBreak
+        ShortCut = 16461
+      end    
+      item
+        Command = ecInsertLine
+        ShortCut = 16462
+      end    
+      item
+        Command = ecDeleteWord
+        ShortCut = 16468
+      end    
+      item
+        Command = ecBlockUnindent
+        ShortCut = 24661
+      end    
+      item
+        Command = ecPaste
+        ShortCut = 16470
+      end    
+      item
+        Command = ecCut
+        ShortCut = 16472
+      end    
+      item
+        Command = ecDeleteLine
+        ShortCut = 16473
+      end    
+      item
+        Command = ecDeleteEOL
+        ShortCut = 24665
+      end    
+      item
+        Command = ecUndo
+        ShortCut = 16474
+      end    
+      item
+        Command = ecRedo
+        ShortCut = 24666
+      end    
+      item
+        Command = ecGotoMarker0
+        ShortCut = 16432
+      end    
+      item
+        Command = ecGotoMarker1
+        ShortCut = 16433
+      end    
+      item
+        Command = ecGotoMarker2
+        ShortCut = 16434
+      end    
+      item
+        Command = ecGotoMarker3
+        ShortCut = 16435
+      end    
+      item
+        Command = ecGotoMarker4
+        ShortCut = 16436
+      end    
+      item
+        Command = ecGotoMarker5
+        ShortCut = 16437
+      end    
+      item
+        Command = ecGotoMarker6
+        ShortCut = 16438
+      end    
+      item
+        Command = ecGotoMarker7
+        ShortCut = 16439
+      end    
+      item
+        Command = ecGotoMarker8
+        ShortCut = 16440
+      end    
+      item
+        Command = ecGotoMarker9
+        ShortCut = 16441
+      end    
+      item
+        Command = ecSetMarker0
+        ShortCut = 24624
+      end    
+      item
+        Command = ecSetMarker1
+        ShortCut = 24625
+      end    
+      item
+        Command = ecSetMarker2
+        ShortCut = 24626
+      end    
+      item
+        Command = ecSetMarker3
+        ShortCut = 24627
+      end    
+      item
+        Command = ecSetMarker4
+        ShortCut = 24628
+      end    
+      item
+        Command = ecSetMarker5
+        ShortCut = 24629
+      end    
+      item
+        Command = ecSetMarker6
+        ShortCut = 24630
+      end    
+      item
+        Command = ecSetMarker7
+        ShortCut = 24631
+      end    
+      item
+        Command = ecSetMarker8
+        ShortCut = 24632
+      end    
+      item
+        Command = ecSetMarker9
+        ShortCut = 24633
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41009
+      end    
+      item
+        Command = EcFoldLevel2
+        ShortCut = 41010
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41011
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41012
+      end    
+      item
+        Command = EcFoldLevel1
+        ShortCut = 41013
+      end    
+      item
+        Command = EcFoldLevel6
+        ShortCut = 41014
+      end    
+      item
+        Command = EcFoldLevel7
+        ShortCut = 41015
+      end    
+      item
+        Command = EcFoldLevel8
+        ShortCut = 41016
+      end    
+      item
+        Command = EcFoldLevel9
+        ShortCut = 41017
+      end    
+      item
+        Command = EcFoldLevel0
+        ShortCut = 41008
+      end    
+      item
+        Command = EcFoldCurrent
+        ShortCut = 41005
+      end    
+      item
+        Command = EcUnFoldCurrent
+        ShortCut = 41003
+      end    
+      item
+        Command = EcToggleMarkupWord
+        ShortCut = 32845
+      end    
+      item
+        Command = ecNormalSelect
+        ShortCut = 24654
+      end    
+      item
+        Command = ecColumnSelect
+        ShortCut = 24643
+      end    
+      item
+        Command = ecLineSelect
+        ShortCut = 24652
+      end    
+      item
+        Command = ecTab
+        ShortCut = 9
+      end    
+      item
+        Command = ecShiftTab
+        ShortCut = 8201
+      end    
+      item
+        Command = ecMatchBracket
+        ShortCut = 24642
+      end    
+      item
+        Command = ecColSelUp
+        ShortCut = 40998
+      end    
+      item
+        Command = ecColSelDown
+        ShortCut = 41000
+      end    
+      item
+        Command = ecColSelLeft
+        ShortCut = 40997
+      end    
+      item
+        Command = ecColSelRight
+        ShortCut = 40999
+      end    
+      item
+        Command = ecColSelPageDown
+        ShortCut = 40994
+      end    
+      item
+        Command = ecColSelPageBottom
+        ShortCut = 57378
+      end    
+      item
+        Command = ecColSelPageUp
+        ShortCut = 40993
+      end    
+      item
+        Command = ecColSelPageTop
+        ShortCut = 57377
+      end    
+      item
+        Command = ecColSelLineStart
+        ShortCut = 40996
+      end    
+      item
+        Command = ecColSelLineEnd
+        ShortCut = 40995
+      end    
+      item
+        Command = ecColSelEditorTop
+        ShortCut = 57380
+      end    
+      item
+        Command = ecColSelEditorBottom
+        ShortCut = 57379
+      end>
+    MouseActions = <    
+      item
+        Shift = []
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 1
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssShift]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 1
+        MoveCaret = True
+        Option = 1
+        Priority = 0
+      end    
+      item
+        Shift = [ssAlt]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 3
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssShift, ssAlt]
+        ShiftMask = [ssShift, ssAlt]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 3
+        MoveCaret = True
+        Option = 1
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbRight
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 12
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccDouble
+        ClickDir = cdDown
+        Command = 6
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccTriple
+        ClickDir = cdDown
+        Command = 7
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccQuad
+        ClickDir = cdDown
+        Command = 8
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbMiddle
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 10
+        MoveCaret = True
+        Option = 0
+        Priority = 0
+      end    
+      item
+        Shift = [ssCtrl]
+        ShiftMask = [ssShift, ssAlt, ssCtrl]
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdUp
+        Command = 11
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    MouseSelActions = <    
+      item
+        Shift = []
+        ShiftMask = []
+        Button = mbLeft
+        ClickCount = ccSingle
+        ClickDir = cdDown
+        Command = 9
+        MoveCaret = False
+        Option = 0
+        Priority = 0
+      end>
+    Lines.Strings = (
+      'SynEdit2'
+    )
+    BracketHighlightStyle = sbhsBoth
+    inline SynGutterPartList1: TSynGutterPartList
+      object SynGutterMarks1: TSynGutterMarks
+        Width = 23
+      end
+      object SynGutterLineNumber1: TSynGutterLineNumber
+        Width = 17
+        MouseActions = <>
+        MarkupInfo.Background = clBtnFace
+        MarkupInfo.Foreground = clNone
+        DigitCount = 2
+        ShowOnlyLineNumbersMultiplesOf = 1
+        ZeroStart = False
+        LeadingZeros = False
+      end
+      object SynGutterChanges1: TSynGutterChanges
+        Width = 4
+        ModifiedColor = 59900
+        SavedColor = clGreen
+      end
+      object SynGutterSeparator1: TSynGutterSeparator
+        Width = 2
+      end
+      object SynGutterCodeFolding1: TSynGutterCodeFolding
+        MouseActions = <        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbRight
+            ClickCount = ccSingle
+            ClickDir = cdUp
+            Command = 16
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = [ssShift]
+            Button = mbMiddle
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = [ssShift]
+            ShiftMask = [ssShift]
+            Button = mbMiddle
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 1
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 0
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end>
+        MarkupInfo.Background = clNone
+        MarkupInfo.Foreground = clGray
+        MouseActionsExpanded = <        
+          item
+            Shift = []
+            ShiftMask = []
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 14
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end>
+        MouseActionsCollapsed = <        
+          item
+            Shift = [ssCtrl]
+            ShiftMask = [ssCtrl]
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 15
+            MoveCaret = False
+            Option = 0
+            Priority = 0
+          end        
+          item
+            Shift = []
+            ShiftMask = [ssCtrl]
+            Button = mbLeft
+            ClickCount = ccAny
+            ClickDir = cdDown
+            Command = 15
+            MoveCaret = False
+            Option = 1
+            Priority = 0
+          end>
+      end
+    end
+  end
+  object TreeView1: TTreeView
+    Left = 566
+    Height = 354
+    Top = 72
+    Width = 185
+    DefaultItemHeight = 15
+    TabOrder = 5
+  end
+  object Label4: TLabel
+    Left = 567
+    Height = 14
+    Top = 55
+    Width = 50
+    Caption = 'Struktura:'
+    ParentColor = False
+  end
+  object SynPasSyn1: TSynPasSyn
+    CompilerMode = pcmDelphi
+    NestedComments = False
+    left = 376
+    top = 56
+  end
+  object SynCppSyn1: TSynCppSyn
+    DefaultFilter = 'C++ Files (*.c,*.cpp,*.h,*.hpp,*.hh)|*.c;*.cpp;*.h;*.hpp;*.hh'
+    left = 376
+    top = 112
+  end
 end

branches/Void/UMainForm.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, UCompilator, UOutputGenerator;
+  StdCtrls, ComCtrls, SynHighlighterPas, SynEdit, SynHighlighterCpp,
+  UCompilator, UOutputGenerator, UModelViewer;
 
 const
@@ -22 +23 @@
     Label2: TLabel;
     Label3: TLabel;
-    Memo1: TMemo;
-    Memo2: TMemo;
+    Label4: TLabel;
     Memo3: TMemo;
+    SynCppSyn1: TSynCppSyn;
+    SynEdit1: TSynEdit;
+    SynEdit2: TSynEdit;
+    SynPasSyn1: TSynPasSyn;
+    TreeView1: TTreeView;
     procedure ButtonCompileClick(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -32 +37 @@
   private
     SourceCode: TMemoryStream;
+    ModelViewer: TModelViewer;
     procedure CompilatorError(Text: string; var Terminate: Boolean;
       Position: TPoint);
@@ -47 +53 @@
 procedure TMainForm.FormShow(Sender: TObject);
 begin
-  Memo1.Lines.LoadFromFile(SourceFileName);
+  SynEdit1.Lines.LoadFromFile(SourceFileName);
   ButtonCompileClick(Self);
 end;
@@ -53 +59 @@
 procedure TMainForm.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  Memo1.Lines.SaveToFile(SourceFileName);
+  SynEdit1.Lines.SaveToFile(SourceFileName);
 end;
 
@@ -60 +66 @@
   Compilator := TCompilator.Create;
   Compilator.OnError := CompilatorError;
+  ModelViewer := TModelViewer.Create;
 end;
 
@@ -65 +72 @@
 begin
   Compilator.Destroy;
+  ModelViewer.Destroy;
 end;
 
@@ -73 +81 @@
   with Compilator do begin
     Memo3.Lines.Clear;
-    Code := Memo1.Lines.Text;
+    Code := SynEdit1.Lines.Text;
     SourceCode.Size := 0;
     SourceCode.Write(Code[1], Length(Code));
     if Assigned(Generator) then Generator.Destroy;
-    if ComboBox1.ItemIndex = 0 then
-      Generator := TPascalGenerator.Create
-      else Generator := TCGenerator.Create;
+    if ComboBox1.ItemIndex = 0 then begin
+      Generator := TPascalGenerator.Create;
+      SynEdit2.Highlighter := SynPasSyn1;
+    end else begin
+      Generator := TCGenerator.Create;
+      SynEdit2.Highlighter := SynCppSyn1;
+    end;
     Compile;
-    Memo2.Lines.Assign(Generator.Output);
-    end;
+    SynEdit2.Lines.Assign(Generator.Output);
+    ModelViewer.Show(TreeView1);
+  end;
 end;
 

branches/Void/project1.lpi

@@ -9 +9 @@
       <Icon Value="0"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="3"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <VersionInfo>
@@ -28 +28 @@
       </local>
     </RunParams>
-    <RequiredPackages Count="1">
+    <RequiredPackages Count="2">
       <Item1>
+        <PackageName Value="SynEdit"/>
+        <MinVersion Major="1" Valid="True"/>
+      </Item1>
+      <Item2>
         <PackageName Value="LCL"/>
-      </Item1>
+      </Item2>
     </RequiredPackages>
-    <Units Count="15">
+    <Units Count="16">
       <Unit0>
         <Filename Value="project1.lpr"/>
@@ -40 +44 @@
         <CursorPos X="37" Y="7"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="42"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -50 +54 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <CursorPos X="46" Y="28"/>
-        <TopLine Value="28"/>
+        <CursorPos X="22" Y="82"/>
+        <TopLine Value="20"/>
         <EditorIndex Value="0"/>
-        <UsageCount Value="42"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit1>
@@ -59 +63 @@
         <Filename Value="UCompilator.pas"/>
         <UnitName Value="UCompilator"/>
-        <CursorPos X="53" Y="168"/>
-        <TopLine Value="149"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="21"/>
+        <CursorPos X="25" Y="228"/>
+        <TopLine Value="213"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="22"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -69 +73 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UOutputGenerator"/>
-        <CursorPos X="7" Y="160"/>
-        <TopLine Value="127"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="42"/>
+        <CursorPos X="18" Y="144"/>
+        <TopLine Value="93"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit3>
@@ -80 +84 @@
         <CursorPos X="4" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="42"/>
+        <UsageCount Value="44"/>
         <SyntaxHighlighter Value="None"/>
       </Unit4>
@@ -90 +94 @@
         <TopLine Value="215"/>
         <EditorIndex Value="6"/>
-        <UsageCount Value="42"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit5>
@@ -124 +128 @@
         <CursorPos X="5" Y="51"/>
         <TopLine Value="45"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="42"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="44"/>
         <Loaded Value="True"/>
       </Unit10>
@@ -146 +150 @@
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="11"/>
-        <Loaded Value="True"/>
+        <UsageCount Value="12"/>
       </Unit13>
       <Unit14>
@@ -156 +158 @@
         <UsageCount Value="10"/>
       </Unit14>
+      <Unit15>
+        <Filename Value="UModelViewer.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UModelViewer"/>
+        <CursorPos X="45" Y="36"/>
+        <TopLine Value="15"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="20"/>
+        <Loaded Value="True"/>
+      </Unit15>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="UCompilator.pas"/>
-        <Caret Line="148" Column="1" TopLine="133"/>
+        <Caret Line="166" Column="55" TopLine="149"/>
       </Position1>
       <Position2>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="149" Column="1" TopLine="134"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="28" Column="46" TopLine="28"/>
       </Position2>
       <Position3>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="183" Column="1" TopLine="168"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="29" Column="46" TopLine="28"/>
       </Position3>
       <Position4>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="184" Column="1" TopLine="169"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="30" Column="46" TopLine="28"/>
       </Position4>
       <Position5>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="185" Column="1" TopLine="170"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="29" Column="46" TopLine="28"/>
       </Position5>
       <Position6>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="186" Column="1" TopLine="171"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="28" Column="46" TopLine="28"/>
       </Position6>
       <Position7>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="187" Column="1" TopLine="172"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="29" Column="46" TopLine="28"/>
       </Position7>
       <Position8>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="188" Column="1" TopLine="173"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="50" Column="1" TopLine="35"/>
       </Position8>
       <Position9>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="190" Column="1" TopLine="175"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="56" Column="10" TopLine="41"/>
       </Position9>
       <Position10>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="191" Column="1" TopLine="176"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="74" Column="49" TopLine="61"/>
       </Position10>
       <Position11>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="192" Column="1" TopLine="177"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="73" Column="49" TopLine="61"/>
       </Position11>
       <Position12>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="193" Column="1" TopLine="178"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="74" Column="49" TopLine="61"/>
       </Position12>
       <Position13>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="194" Column="1" TopLine="179"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="84" Column="44" TopLine="69"/>
       </Position13>
       <Position14>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="212" Column="1" TopLine="197"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="92" Column="33" TopLine="60"/>
       </Position14>
       <Position15>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="213" Column="1" TopLine="198"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="93" Column="33" TopLine="63"/>
       </Position15>
       <Position16>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="214" Column="1" TopLine="199"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="92" Column="33" TopLine="63"/>
       </Position16>
       <Position17>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="215" Column="1" TopLine="200"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="93" Column="33" TopLine="63"/>
       </Position17>
       <Position18>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="216" Column="22" TopLine="187"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="41" Column="29" TopLine="16"/>
       </Position18>
       <Position19>
-        <Filename Value="UOutputGenerator.pas"/>
-        <Caret Line="116" Column="26" TopLine="100"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="113" Column="1" TopLine="83"/>
       </Position19>
       <Position20>
-        <Filename Value="UOutputGenerator.pas"/>
-        <Caret Line="74" Column="44" TopLine="59"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="110" Column="32" TopLine="90"/>
       </Position20>
       <Position21>
-        <Filename Value="UOutputGenerator.pas"/>
-        <Caret Line="114" Column="52" TopLine="99"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="113" Column="49" TopLine="89"/>
       </Position21>
       <Position22>
-        <Filename Value="UOutputGenerator.pas"/>
-        <Caret Line="150" Column="44" TopLine="135"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="16" Column="17" TopLine="1"/>
       </Position22>
       <Position23>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="216" Column="22" TopLine="187"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="105" Column="1" TopLine="79"/>
       </Position23>
       <Position24>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="230" Column="15" TopLine="211"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="41" Column="1" TopLine="26"/>
       </Position24>
       <Position25>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="232" Column="22" TopLine="212"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="39" Column="31" TopLine="17"/>
       </Position25>
       <Position26>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="192" Column="96" TopLine="187"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="23" Column="12" TopLine="1"/>
       </Position26>
       <Position27>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="11" Column="16" TopLine="1"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="25" Column="25" TopLine="5"/>
       </Position27>
       <Position28>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="46" Column="8" TopLine="19"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="17" Column="48" TopLine="4"/>
       </Position28>
       <Position29>
-        <Filename Value="UModel.pas"/>
-        <Caret Line="229" Column="27" TopLine="215"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="26" Column="3" TopLine="15"/>
       </Position29>
       <Position30>
-        <Filename Value="UCompilator.pas"/>
-        <Caret Line="167" Column="107" TopLine="148"/>
+        <Filename Value="UModelViewer.pas"/>
+        <Caret Line="17" Column="46" TopLine="2"/>
       </Position30>
     </JumpHistory>

branches/Void/project1.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UMainForm, UOutputGenerator, LResources, UModel, UVoidParser;
+  Forms, UMainForm, UOutputGenerator, LResources, UModel, UVoidParser,
+  UModelViewer;
 
 {$IFDEF WINDOWS}{$R project1.rc}{$ENDIF}