Changeset 64 for branches/Transpascal/Compiler

Timestamp:

Oct 15, 2010, 2:13:42 PM (15 years ago)

Author:

george

Message:

• Fixed: Focus message position in code.

Location:

branches/Transpascal/Compiler

Files:

• Analyze/UParser.pas (modified) (12 diffs)
• UCompiler.pas (modified) (5 diffs)
• USourceCode.pas (modified) (1 diff)

branches/Transpascal/Compiler/Analyze/UParser.pas

@@ -402 +402 @@
   Expressions := TExpressionList.Create;
   Expressions.Add(TExpression.Create);
-  with SourceCode do
-  begin
+  with SourceCode do begin
     while ((FNextToken <> ';') and (FNextToken <> ',') and
         (not IsKeyWord(FNextToken))) and not
-      (((FNextToken = ')') or (FNextToken = ']'))) do
-    begin
+      (((FNextToken = ')') or (FNextToken = ']'))) do begin
       Identifier := ReadCode;
-      if Identifier = '(' then
-      begin
+      if Identifier = '(' then begin
         // Subexpression
-        with TExpression(Expressions.Last) do
-        begin
+        with TExpression(Expressions.Last) do begin
           SubItems[1] := TExpression.Create;
           ParseExpression(TExpression(SubItems[1]));
@@ -423 +419 @@
         end;
         Expect(')');
-      end
-      else
-      if IsOperator(Identifier) then
-      begin
+      end else
+      if IsOperator(Identifier) then begin
         // Operator
         TExpression(Expressions.Last).OperatorName := Identifier;
         TExpression(Expressions.Last).NodeType := ntOperator;
-      end
-      else
-      if IsIdentificator(Identifier) then
-      begin
+      end else
+      if IsIdentificator(Identifier) then begin
         // Reference to identificator
         NewVariable := CommonBlock.Variables.Search(Identifier);
-        if Assigned(NewVariable) then
-        begin
+        if Assigned(NewVariable) then begin
           // Referenced variable
-          with TExpression(Expressions.Last) do
-          begin
+          with TExpression(Expressions.Last) do begin
             SubItems[1] := TExpression.Create;
             TExpression(SubItems[1]).NodeType := ntVariable;
@@ -450 +440 @@
             SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
           end;
-        end
-        else
-        begin
+        end else begin
           Method := CommonBlock.Functions.Search(Identifier);
           if Assigned(Method) then
           begin
             // Referenced method
-            with TExpression(Expressions.Last) do
-            begin
+            with TExpression(Expressions.Last) do begin
               SubItems[1] := TExpression.Create;
               if FNextToken = '(' then               // Method with parameters
-                with TExpression(SubItems[1]) do
-                begin
+                with TExpression(SubItems[1]) do begin
                   Expect('(');
                   NewExpression := TExpression.Create;
@@ -468 +454 @@
                   ParseExpression(NewExpression);
                   SubItems.Add(NewExpression);
-                  while FNextToken = ',' do
-                  begin
+                  while FNextToken = ',' do begin
                     Expect(',');
                     NewExpression := TExpression.Create;
@@ -487 +472 @@
                 TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
             end;
-          end
-          else
-          begin
+          end else begin
             Constant := CommonBlock.Constants.Search(Identifier);
-            if Assigned(Constant) then
-            begin
+            if Assigned(Constant) then begin
               // Referenced constant
-              with TExpression(Expressions.Last) do
-              begin
+              with TExpression(Expressions.Last) do begin
                 SubItems[1] := TExpression.Create;
                 TExpression(SubItems[1]).NodeType := ntConstant;
@@ -501 +482 @@
               end;
               with TExpression(Expressions.Items[Expressions.Add(
-                  TExpression.Create)]) do
-              begin
+                  TExpression.Create)]) do begin
                 CommonBlock := SourceCode.CommonBlock;
                 SubItems[0] :=
                   TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
               end;
-            end
-            else
-            begin
+            end else begin
               ErrorMessage(SUnknownIdentifier, [Identifier]);
             end;
           end;
         end;
-      end
-      else
-      begin
+      end else begin
         // Constant value
         with TExpression(Expressions.Last) do
@@ -524 +500 @@
           TExpression(SubItems[1]).NodeType := ntConstant;
 
-          if Identifier[1] = '''' then
-          begin
+          if Identifier[1] = '''' then begin
             TExpression(SubItems[1]).Value := Identifier;
             //SetLength(TExpression(SubItems[1]).Value, Length(Identifier));
             //for I := 1 to Length(Identifier) do
             //  TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
-          end
-          else
-          begin
+          end else begin
             TExpression(SubItems[1]).Value := Identifier;
           end;
@@ -546 +519 @@
 
     // Build expression tree
-    for II := 0 to High(Operators) do
-    begin
+    for II := 0 to High(Operators) do begin
       I := 1;
-      while (I < Expressions.Count - 1) do
-      begin
+      while (I < Expressions.Count - 1) do begin
         if not TExpression(Expressions[I]).Associated and
           (TExpression(Expressions[I]).OperatorName = Operators[II]) then
@@ -558 +529 @@
           TExpression(Expressions[I + 1]).SubItems[0] := Expressions[I];
           //Expressions.Delete(I);
-        end
-        else
-          Inc(I);
+        end else Inc(I);
       end;
     end;
@@ -569 +538 @@
     if Expressions.Count > 1 then
       TExpression(Expressions[1]).SubItems[0] := nil;
-    Expressions.Destroy;
+    Expressions.Free;
   end;
 end;
@@ -1168 +1137 @@
   begin
     Name := ReadCode;
+    if FNextToken = 'in' then begin
+      Expect('in');
+      Location := ReadCode;
+    end else Location := Name + '.pas';
     Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
     if not Assigned(Module) then begin
@@ -1181 +1154 @@
     begin
       Name := ReadCode;
+      if FNextToken = 'in' then begin
+        Expect('in');
+        Location := ReadCode;
+      end else Location := Name + '.pas';
       Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
       if not Assigned(Module) then begin

branches/Transpascal/Compiler/UCompiler.pas

@@ -18 +18 @@
   end;
 
-  { TCompiler }
+  TCompilerTarget = class
+    Vendor: string;
+    Model: string;
+    Architecture: string;
+  end;
+
+  { TCompilerList }
+
+  TCompilerTargetList = class(TObjectList)
+    procedure Add(Vendor, Model, Architecture: string);
+  end;
 
   TCompiler = class
@@ -30 +40 @@
     ErrorMessages: TObjectList;
     CompiledFolder: string;
+    SupportedTargets: TCompilerTargetList;
+    Target: TCompilerTarget;
     constructor Create;
+    destructor Destroy; override;
     procedure Init;
     procedure Compile(ModuleName: string; Source: TStringList);
-    destructor Destroy; override;
     property OnErrorMessage: TOnErrorMessage read FOnErrorMessage
       write FOnErrorMessage;
@@ -69 +81 @@
 constructor TCompiler.Create;
 begin
+  SupportedTargets := TCompilerTargetList.Create;
+  SupportedTargets.Add('AMD', 'Athlon II', 'amd64');
+  SupportedTargets.Add('Zilog', 'Z80', 'Z80');
+  SupportedTargets.Add('Rabbit', 'RC3000', 'Z180');
+  SupportedTargets.Add('Atmel', 'ATmega8', 'AVR');
+  SupportedTargets.Add('Atmel', 'UC3B0256', 'AVR32');
+  SupportedTargets.Add('Dallas', 'DS89C450', '8052');
+
   ProgramCode := TProgram.Create;
   Producer := TProducerC.Create;
@@ -89 +109 @@
   Producer.Free;
   ErrorMessages.Free;
+  SupportedTargets.Free;
 end;
 
@@ -103 +124 @@
 end;
 
+{ TCompilerTargetList }
+
+procedure TCompilerTargetList.Add(Vendor, Model, Architecture: string);
+var
+  NewItem: TCompilerTarget;
+begin
+  NewItem := TCompilerTarget.Create;
+  NewItem.Vendor := Vendor;
+  NewItem.Model := Model;
+  NewItem.Architecture := Architecture;
+  inherited Add(NewItem);
+end;
+
 end.

branches/Transpascal/Compiler/USourceCode.pas

@@ -252 +252 @@
   TUsedModule = class
     Name: string;
+    Location: string;
     Module: TModule;
     Exported: Boolean;