Merge pull request #38 from Irwin1985/version_9

revision 9.6

Author: Irwin1985

JSONFox.PJT

@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.5"
+	version 		= "9.6"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

JSONFox.pjx

@@ -1,61 +1,65 @@
 #include "JSONFox.h"
-define class NETScanner as custom
+Define Class NETScanner As Custom
 	Hidden capacity
-	Hidden length
+	Hidden Length
+	Hidden Scanner
 	Dimension tokens[1]
-	
-	function init(strInput)
-		public ns
-		ns = createobject("JSONFoxHelper.Lexer")
-		ns.ReadString(strInput)
-		this.length = 1
-		this.capacity = 0		
-	EndFunc
-	
-	function scanTokens
-		return ns.NextToken()
-	endfunc
-	
+
+	Function Init(strInput)
+		With This
+			.Scanner = Createobject("JSONFoxHelper.Lexer")
+			.Scanner.ReadString(strInput)
+			.Length   = 1
+			.capacity = 0
+		Endwith
+	Endfunc
+
 	Function scanTokens
-		Local loToken
-		Dimension this.tokens[1]
-		loToken = ns.NextToken()
-		this.addToken(loToken.type, loToken.value, 1)
-		
-		Do while loToken.type != T_EOF
-			loToken = ns.NextToken()
-			this.addToken(loToken.type, loToken.value, 1)
-		EndDo
-		this.addToken(T_EOF, "", 1)
-		this.capacity = this.length-1
-		
-		* Shrink array
-		Dimension this.tokens[this.capacity]
-		
-		Return @this.tokens
-	EndFunc
-
-	hidden function addToken(tnTokenType, tcTokenValue, tnLine)
-		this.checkCapacity()
-		local loToken
-		loToken = createobject("Empty")
-		=addproperty(loToken, "type", tnTokenType)
-		=addproperty(loToken, "value", tcTokenValue)
-		=AddProperty(loToken, "line", tnLine)
-		
-		this.tokens[this.length] = loToken
-		this.length = this.length + 1		
-	EndFunc
-	
-	Hidden function checkCapacity
-		If this.capacity < this.length + 1
-			If Empty(this.capacity)
-				this.capacity = 8
-			Else
-				this.capacity = this.capacity * 2
-			EndIf			
-			Dimension this.tokens[this.capacity]
-		EndIf
-	endfunc
-
-enddefine
+		With This
+			Local loToken
+			Dimension .tokens[1]
+			loToken = .Scanner.NextToken()
+			.addToken(loToken.Type, loToken.Value, 1)
+
+			Do While loToken.Type != 0 && 0 T_NONE
+				loToken = .Scanner.NextToken()
+				.addToken(loToken.Type, loToken.Value, 1)
+			Enddo
+			.addToken(T_EOF, "", 1)
+			.capacity = .Length-1
+
+			* Shrink array
+			Dimension .tokens[.capacity]
+
+			Return @.tokens
+		Endwith
+	Endfunc
+
+	Hidden Function addToken(tnTokenType, tcTokenValue, tnLine)
+		With This
+			.checkCapacity()
+			Local loToken
+			loToken = Createobject("Empty")
+			=AddProperty(loToken, "type",  tnTokenType)
+			=AddProperty(loToken, "value", tcTokenValue)
+			=AddProperty(loToken, "line",  tnLine)
+
+			.tokens[.length] = loToken
+			.Length = .Length + 1
+		Endwith
+	Endfunc
+
+	Hidden Function checkCapacity
+		With This
+			If .capacity < .Length + 1
+				If Empty(.capacity)
+					.capacity = 8
+				Else
+					.capacity = .capacity * 2
+				Endif
+				Dimension .tokens[.capacity]
+			Endif
+		Endwith
+	Endfunc
+
+Enddefine