Browse Source

Changed pseudo array object name.

woollybah 11 years ago
parent
commit
b98fd3b016
4 changed files with 4 additions and 4 deletions
  1. 1 1
      expr.bmx
  2. 1 1
      iparser.bmx
  3. 1 1
      toker.bmx
  4. 1 1
      type.bmx

+ 1 - 1
expr.bmx

@@ -980,7 +980,7 @@ Type TCastExpr Extends TExpr
 		End If
 		
 		If TArrayType(ty) And TObjectType(src) 
-			If TObjectType(src).classDecl.ident = "Array" Then
+			If TObjectType(src).classDecl.ident = "___Array" Then
 				exprType = ty
 				Return expr
 			Else If  TObjectType(src).classDecl.ident = "Object" Then

+ 1 - 1
iparser.bmx

@@ -513,7 +513,7 @@ Type TIParser
 	Method ParseIdent$()
 		Select _toker._toke.tolower()
 		Case "@" _toker.NextToke
-		Case "string","array","object"
+		Case "string","___array","object"
 		Default	
 			If _toker._tokeType<>TOKE_IDENT Err "Syntax error - expecting identifier."
 		End Select

+ 1 - 1
toker.bmx

@@ -45,7 +45,7 @@ Type TToker
 	Const _keywords$=";"+ ..
 	"strict;superstrict;"+ ..
 	"public;private;"+ ..
-	"short;int;float;double;long;string;object;array;ptr;var;varptr;mod;continue;exit;"+ ..
+	"short;int;float;double;long;string;object;ptr;var;varptr;mod;continue;exit;"+ ..
 	"include;import;module;extern;framework;"+ ..
 	"new;self;super;eachin;true;false;null;not;"+ ..
 	"extends;abstract;select;case;default;"+ ..

+ 1 - 1
type.bmx

@@ -616,7 +616,7 @@ Type TArrayType Extends TType
 	
 	Method GetClass:TClassDecl()
 		'Return _env.FindClassDecl( "array" )
-		Return TClassDecl( _env.FindDecl( "array" ) )
+		Return TClassDecl( _env.FindDecl( "___array" ) )
 	End Method
 
 	Method OnCopy:TType()