Changeset 18 for trunk/Compiler

Timestamp:

Nov 9, 2010, 8:10:12 AM (14 years ago)

Author:

george

Message:

• Modified: Generation of types in ProducerPascal.

Location:

trunk/Compiler

Files:

• Analyze/UAnalyzerPascal.pas (modified) (2 diffs)
• Produce/UProducerPascal.pas (modified) (4 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -1198 +1198 @@
       UseName := NextToken;
       if NextTokenType = ttIdentifier then begin
-        UseType := TypeList.Parent.Types.Search(UseName);
+        TTypeArray(Result).IndexType := TypeList.Parent.Types.Search(UseName);
         if not Assigned(TTypeArray(Result).IndexType) then
           ErrorMessage(SUndefinedType, [UseName], -1) else
@@ -1204 +1204 @@
       end else
       if NextTokenType = ttConstantNumber then begin
-        UseType := ParseTypeSubRange(TypeList, Name);
-        if not Assigned(UseType) then begin
+        TTypeArray(Result).IndexType := ParseTypeSubRange(TypeList, Name);
+        if not Assigned(TTypeArray(Result).IndexType) then begin
           ErrorMessage(SInvalidConstruction, [], -1);
         end;

trunk/Compiler/Produce/UProducerPascal.pas

@@ -123 +123 @@
 begin
   if AType is TTypeRecord then begin
-    EmitLn(AType.Name + ' ' + AssignSymbol + ' record');
+    EmitLn('record');
     Inc(Indetation);
-    for I := 0 to TTypeRecord(AType).CommonBlock.Types.Count - 1 do begin
-      GenerateType(TType(TTypeRecord(AType).CommonBlock.Types[I]));
+    with TTypeRecord(AType).CommonBlock do
+    for I := 0 to Variables.Count - 1 do begin
+      Emit(Variables[I].Name + ': ');
+      GenerateType(Variables[I].ValueType);
       EmitLn(';');
     end;
@@ -132 +134 @@
     Emit('end');
   end else
+  if AType is TTypeSubRange then begin
+    Emit(TTypeSubRange(AType).Bottom + '..' + TTypeSubRange(AType).Top);
+  end else
   if AType is TTypeArray then begin
-    Emit(AType.Name + ' ' + AssignSymbol + ' array ');
+    Emit('array ');
     if Assigned(TTypeArray(AType).IndexType) then begin
       Emit('[');
@@ -142 +147 @@
     if Assigned(TTypeArray(AType).ItemType) then
       GenerateType(TTypeArray(AType).ItemType);
+  end else
+  if AType is TTypePointer then begin
+    Emit('^' + TTypePointer(AType).UsedType.Name);
   end else begin
     Emit(AType.Name);
-    if Assigned(AType.UsedType) then begin
-      Emit(' ' + AssignSymbol + ' ');
+    if AType.Name = '' then begin
       GenerateType(AType.UsedType);
     end;
@@ -161 +168 @@
     with TType(Types[I]) do
     if (not Internal) then begin
-      GenerateType(TType(Types[I]), '=');
+      Emit(TType(Types[I]).Name + ' = ');
+      GenerateType(TType(Types[I]));
       EmitLn(';');
     end;