StrToInt -> int64

Author: tebe6502

src/Common.pas

@@ -2,10 +2,7 @@
 
 interface
 
-uses FileIO;
-
 {$i define.inc}
-{$i Types.inc}
 
 // ----------------------------------------------------------------------------
 
@@ -386,9 +383,8 @@   TParam = record
     PassMethod: Byte;
     i, i_: integer;
    end;
-  // General number type. Union of 32-bit REAL in [0] and 32-bit INTEGER in [1]
-  // Depending on the token, either [0] or [1] is used.
-  TFloat = array [0..1] of Longword;
+
+  TFloat = array [0..1] of integer;
 
   TParamList = array [1..MAXPARAMS] of TParam;
 
@@ -413,16 +409,16 @@   TType = record
   TToken = record
     UnitIndex, Column: Smallint;
     Line: Integer;
-    Kind: Byte;
-    // For Kind=IDENTTOK:
-    Name: TString;
-    // For Kind=INTNUMBERTOK:
-    Value: Int64;
-    // For Kind=FRACNUMBERTOK:
-    FracValue: Single;
-    // For Kind=STRINGLITERALTOK:
-    StrAddress: Word;
-    StrLength: Word;
+    case Kind: Byte of
+      IDENTTOK:
+	(Name: ^TString);
+      INTNUMBERTOK:
+	(Value: Int64);
+      FRACNUMBERTOK:
+	(FracValue: Single);
+      STRINGLITERALTOK:
+	(StrAddress: Word;
+	 StrLength: Word);
     end;
 
   TIdentifier = record
@@ -452,33 +448,32 @@   TIdentifier = record
     isInitialized,
     Section: Boolean;
 
-    Kind: Byte;
-
-//  For kind=PROCEDURETOK, FUNCTIONTOK:
-	NumParams: Word;
-	Param: TParamList;
-	ProcAsBlock: Integer;
-	ObjectIndex: Integer;
-
-	IsUnresolvedForward,
-	updateResolvedForward,
-	isOverload,
-	isRegister,
-	isInterrupt,
-	isRecursion,
-	isStdCall,
-	isPascal,
-	isInline,
-	isAsm,
-	isExternal,
-	isKeep,
-	isVolatile,
-	isStriped,
-	IsNotDead: Boolean;
-
-//  For kind=VARIABLE, USERTYPE:
-    NumAllocElements, NumAllocElements_: Cardinal;
-    AllocElementType: Byte
+    case Kind: Byte of
+      PROCEDURETOK, FUNCTIONTOK:
+	(NumParams: Word;
+	 Param: TParamList;
+	 ProcAsBlock: Integer;
+	 ObjectIndex: Integer;
+
+	 IsUnresolvedForward,
+	 updateResolvedForward,
+	 isOverload,
+	 isRegister,
+	 isInterrupt,
+	 isRecursion,
+	 isStdCall,
+	 isPascal,
+	 isInline,
+	 isAsm,
+	 isExternal,
+	 isKeep,
+	 isVolatile,
+	 isStriped,
+	 IsNotDead: Boolean;);
+
+      VARIABLE, USERTYPE:
+	(NumAllocElements, NumAllocElements_: Cardinal;
+	 AllocElementType: Byte);
     end;
 
 
@@ -530,19 +525,15 @@   TIdentifier = record
 
 {$i targets/var.inc}
 
-  const MIN_MEMORY_ADDRESS=$0000;
-  const MAX_MEMORY_ADDRESS=$FFFF;
-  
-  type TWordMemory = array [MIN_MEMORY_ADDRESS..MAX_MEMORY_ADDRESS] of Word;
-  
+
 var
 
   PROGRAM_NAME: string = 'Program';
   LIBRARY_NAME: string;
 
   AsmBlock: array [0..4095] of string;
 
-  Data, DataSegment, StaticStringData: TWordMemory;
+  Data, DataSegment, StaticStringData: array [0..$FFFF] of word;
 
   Types: array [1..MAXTYPES] of TType;
   Tok: array of TToken;
@@ -622,8 +613,6 @@   TIdentifier = record
 
 // ----------------------------------------------------------------------------
 
-	procedure ClearWordMemory(anArray: TWordMemory);
-
 	procedure AddDefine(X: string);
 
 	procedure AddPath(s: string);
@@ -678,7 +667,7 @@   TIdentifier = record
 
 implementation
 
-uses SysUtils, Messages, Utilities;
+uses SysUtils, Messages;
 
 // ----------------------------------------------------------------------------
 
@@ -878,11 +867,9 @@ function GetEnumName(IdentIndex: integer): TString;
 function StrToInt(const a: string): Int64;
 (*----------------------------------------------------------------------------*)
 (*----------------------------------------------------------------------------*)
-var value: integer;
 var i: integer;
 begin
- val(a,value, i);
- Result := value;
+ val(a,Result, i);
 end;
 
 
@@ -918,8 +905,12 @@ function Min(a,b: integer): integer;
 
 
 procedure FreeTokens;
+var i: Integer;
 begin
 
+ for i := 1 to NumTok do
+  if (Tok[i].Kind = IDENTTOK) and (Tok[i].Name <> nil) then Dispose(Tok[i].Name);
+
  SetLength(Tok, 0);
  SetLength(IFTmpPosStack, 0);
  SetLength(UnitPath, 0);
@@ -972,7 +963,7 @@ function ErrTokenFound(ErrTokenIndex: Integer): string;
 procedure CheckOperator(ErrTokenIndex: Integer; op: Byte; DataType: Byte; RightType: Byte = 0);
 begin
 
-//writeln(tok[ErrTokenIndex].Name,',', op,',',DataType);
+//writeln(tok[ErrTokenIndex].Name^,',', op,',',DataType);
 
  if {(not (DataType in (OrdinalTypes + [REALTOK, POINTERTOK]))) or}
    ((DataType in RealTypes) and
@@ -1346,10 +1337,7 @@ procedure DefineStaticString(StrTokenIndex: Integer; StrValue: String);
 else
  Data[0] := len;
 
-if (NumStaticStrChars + len > $FFFF) then
-   begin writeln('DefineStaticString: ' + IntToStr(len));
-         RaiseHaltException(2);
-   end;
+if (NumStaticStrChars + len > $FFFF) then begin writeln('DefineStaticString: ', len); halt end;
 
 for i:=1 to len do Data[i] := ord(StrValue[i]);
 
@@ -1383,12 +1371,5 @@ procedure DefineStaticString(StrTokenIndex: Integer; StrValue: String);
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 
-procedure ClearWordMemory(anArray: TWordMemory);
-begin
-  for i := Low(Ident) to High(Ident) do
-  begin
-  	anArray[i]:=0;
-  end;
-end;
 
 end.