|
@@ -915,10 +915,7 @@ Type TParser Extends TGenProcessor
|
|
ty=New TArrayType.Create( ty )
|
|
ty=New TArrayType.Create( ty )
|
|
|
|
|
|
' test for array of arrays
|
|
' test for array of arrays
|
|
- Local toker:TToker=New TToker.Copy(_toker)
|
|
|
|
- If CParseToker(toker, "[") Or CParseToker(toker, "[]") Then
|
|
|
|
- Continue
|
|
|
|
- End If
|
|
|
|
|
|
+ If IsArrayTypeNext(_toker) Continue
|
|
|
|
|
|
Exit
|
|
Exit
|
|
End If
|
|
End If
|
|
@@ -936,16 +933,25 @@ Type TParser Extends TGenProcessor
|
|
ty=New TArrayType.Create( ty, dims )
|
|
ty=New TArrayType.Create( ty, dims )
|
|
|
|
|
|
' test for array of arrays
|
|
' test for array of arrays
|
|
- Local toker:TToker=New TToker.Copy(_toker)
|
|
|
|
- If CParseToker(toker, "[") Or CParseToker(toker, "[]") Then
|
|
|
|
- Continue
|
|
|
|
- End If
|
|
|
|
|
|
+ If IsArrayTypeNext(_toker) Continue
|
|
|
|
|
|
Exit
|
|
Exit
|
|
Wend
|
|
Wend
|
|
Return ty
|
|
Return ty
|
|
End Method
|
|
End Method
|
|
|
|
|
|
|
|
+ Method IsArrayTypeNext:Int(tok:TToker)
|
|
|
|
+ Local toker:TToker=New TToker.Copy(tok)
|
|
|
|
+ If CParseToker(toker, "[]") Return True
|
|
|
|
+ If CParseToker(toker, "[") Then
|
|
|
|
+ ' look ahead to see if this is an array decl, or something else..
|
|
|
|
+ If CParseToker(toker, "]") Or CParseToker(toker, ",") Then
|
|
|
|
+ Return True
|
|
|
|
+ End If
|
|
|
|
+ End If
|
|
|
|
+ Return False
|
|
|
|
+ End Method
|
|
|
|
+
|
|
Method IsArrayDef:Int()
|
|
Method IsArrayDef:Int()
|
|
Local isDef:Int = True
|
|
Local isDef:Int = True
|
|
Local toker:TToker=New TToker.Copy(_toker)
|
|
Local toker:TToker=New TToker.Copy(_toker)
|