Skip to content

Commit

Permalink
git-svn-id: http://bmx-rjson.googlecode.com/svn/trunk@21 01b81d83-73d…
Browse files Browse the repository at this point in the history 
…2-0bb8-1479-8f8db6b56872
  • Loading branch information
Tylerbot authored and Tylerbot committed Mar 24, 2012
1 parent 4a77fda commit 5e34469
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 34 deletions.
34 changes: 34 additions & 0 deletions rjson-test.bmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,3 +842,37 @@ End Try
EndRem


'////////////////////////////////////////
Print( "~ntest 8.1 - Encoding Object whose fields are a TList and a TMap" )
Try
Type Complex
Field list:TList
Field map:TMap
EndType
Local c:Complex = New Complex
c.list = CreateList()
c.list.AddLast( "listval1" )
c.list.AddLast( "listval2" )
c.map = CreateMap()
c.map.Insert( "key1", "mapval1" )
c.map.Insert( "key2", "mapval2" )
Print JSON.Encode( c )
Catch ex$
Print "Test FAILED with Exception: "+ex
End Try

'////////////////////////////////////////
Print( "~ntest 8.2 - Encoding Array whose elements are a TList and a TMap" )
Try
Local a:Object[] = New Object[2]
Local list:TList = CreateList()
list.AddLast( "listval1" )
list.AddLast( "listval2" )
Local map:TMap = CreateMap()
map.Insert( "key1", "mapval1" )
map.Insert( "key2", "mapval2" )
Print JSON.Encode( a )
Catch ex$
Print "Test FAILED with Exception: "+ex
End Try

137 changes: 103 additions & 34 deletions rjson.bmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
' with the following minor modifications(s):
' - when decoding, it is okay for numbers to have any number of leading zeroes
' - when decoding, the '#' character outside of a string is treated as a single-line comment
' - when decoding, it is okay for string values to be unquoted, as long as they only contain the following characters:
' A-Za-z_0-9, and do not start with a number
' - when decoding, a semicolon is an acceptable substitute for a comma

SuperStrict
Module twrc.rjson
Expand Down Expand Up @@ -58,15 +61,15 @@ Type JSON
If json_object
Return _InitializeObject( json_object, settings, typeId )
Else
Throw( "Error: an object is desired, but an array was found" )
Throw( " Error: an object is desired, but an array was found" )
Return Null
End If
Else 'array type provided
Local json_array:TList = _DecodeJSONArray( encoded_json_data, cursor )
If json_array
Return _InitializeArray( json_array, settings, typeId )
Else
Throw( "Error: an array is desired, but an object was found" )
Throw( " Error: an array is desired, but an object was found" )
End If
End If
Return decoded_object
Expand Down Expand Up @@ -336,7 +339,13 @@ Type JSON
decoded_datum = TJSONDouble.Create( temp_datum.ToDouble() )
End If
End If
If Not decoded_datum Then Throw "Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
If Not decoded_datum
Local temp_datum:TJSONBoolean = TJSONBoolean(value)
If temp_datum
decoded_datum = TJSONDouble.Create( temp_datum.value )
End If
End If
If Not decoded_datum Then Throw " Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
object_field.SetInt( decoded_object, Int(decoded_datum.value) )
Case LongTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
Expand All @@ -346,7 +355,13 @@ Type JSON
decoded_datum = TJSONDouble.Create( temp_datum.ToDouble() )
End If
End If
If Not decoded_datum Then Throw "Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
If Not decoded_datum
Local temp_datum:TJSONBoolean = TJSONBoolean(value)
If temp_datum
decoded_datum = TJSONDouble.Create( temp_datum.value )
End If
End If
If Not decoded_datum Then Throw " Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
object_field.SetLong( decoded_object, Long(decoded_datum.value) )
Case FloatTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
Expand All @@ -356,7 +371,13 @@ Type JSON
decoded_datum = TJSONDouble.Create( temp_datum.ToDouble() )
End If
End If
If Not decoded_datum Then Throw "Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
If Not decoded_datum
Local temp_datum:TJSONBoolean = TJSONBoolean(value)
If temp_datum
decoded_datum = TJSONDouble.Create( temp_datum.value )
End If
End If
If Not decoded_datum Then Throw " Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
object_field.SetFloat( decoded_object, Float(decoded_datum.value) )
Case DoubleTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
Expand All @@ -366,7 +387,13 @@ Type JSON
decoded_datum = TJSONDouble.Create( temp_datum.ToDouble() )
End If
End If
If Not decoded_datum Then Throw "Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
If Not decoded_datum
Local temp_datum:TJSONBoolean = TJSONBoolean(value)
If temp_datum
decoded_datum = TJSONDouble.Create( temp_datum.value )
End If
End If
If Not decoded_datum Then Throw " Error: attempt to assign to field "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name()+" with value "+ObjectInfo(value)
object_field.SetDouble( decoded_object, Double(decoded_datum.value) )
Case StringTypeId
Local decoded_datum:String = String(value)
Expand All @@ -385,19 +412,20 @@ Type JSON
object_field.Set( decoded_object, value )
Default 'user defined objects
Local json_child_object:TMap = TMap(value)
If Not json_child_object Then Throw( "Error: an object is desired, but something else was found: "+ObjectInfo(value) )
If Not json_child_object Then Throw( " Error: an object is desired, but something else was found: "+ObjectInfo(value) )
object_field.Set( decoded_object, _InitializeObject( json_child_object, settings, object_field_type_id ))
End Select
'Catch ex$
' Throw( "Error: could not assign decoded object member ("+ObjectInfo(value)+") to "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name() )
' Throw( " Error: could not assign decoded object member ("+ObjectInfo(value)+") to "+type_id.Name()+"."+object_field.Name()+":"+object_field_type_id.Name() )
'End Try
Else 'array field type found
Local json_child_array:TList = TList(value)
If Not json_child_array Then Throw( "Error: an array is desired, but something else was found: "+ObjectInfo(value) )
If Not json_child_array Then Throw( " Error: an array is desired, but something else was found: "+ObjectInfo(value) )
object_field.Set( decoded_object, _InitializeArray( json_child_array, settings, object_field_type_id ))
End If
Else
'Ignore this error, there was extra data
DebugLog( " Warning: field "+key+" not found in type "+type_id.Name())
End If
Next
Return decoded_object
Expand All @@ -419,19 +447,19 @@ Type JSON
ShortTypeId, ..
IntTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
If Not decoded_datum Then Throw "Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
If Not decoded_datum Then Throw " Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
type_id.SetArrayElement( decoded_object, index, decoded_datum.ToString() )
Case LongTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
If Not decoded_datum Then Throw "Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
If Not decoded_datum Then Throw " Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
type_id.SetArrayElement( decoded_object, index, decoded_datum.ToString() )
Case FloatTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
If Not decoded_datum Then Throw "Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
If Not decoded_datum Then Throw " Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
type_id.SetArrayElement( decoded_object, index, decoded_datum.ToString() )
Case DoubleTypeId
Local decoded_datum:TJSONDouble = TJSONDouble(value)
If Not decoded_datum Then Throw "Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
If Not decoded_datum Then Throw " Error: attempt to assign to array element "+element_type_id.Name()+"["+index+"] with value "+ObjectInfo(value)
type_id.SetArrayElement( decoded_object, index, decoded_datum.ToString() )
Case StringTypeId
Local decoded_datum:String = String(value)
Expand All @@ -441,15 +469,15 @@ Type JSON
type_id.SetArrayElement( decoded_object, index, value )
Default 'user defined objects
Local json_child_object:TMap = TMap(value)
If Not json_child_object Then Throw( "Error: an object is desired, but something else was found: "+ObjectInfo(value) )
If Not json_child_object Then Throw( " Error: an object is desired, but something else was found: "+ObjectInfo(value) )
type_id.SetArrayElement( decoded_object, index, _InitializeObject( json_child_object, settings, element_type_id ))
End Select
'Catch ex$
' Throw( "Error: could not assign decoded array element ("+ObjectInfo(value)+") to "+type_id.ElementType().Name()+"["+index+"]" )
' Throw( " Error: could not assign decoded array element ("+ObjectInfo(value)+") to "+type_id.ElementType().Name()+"["+index+"]" )
'End Try
Else 'array element type found
Local json_child_array:TList = TList(value)
If Not json_child_array Then Throw( "Error: an array is desired, but something else was found: "+ObjectInfo(value) )
If Not json_child_array Then Throw( " Error: an array is desired, but something else was found: "+ObjectInfo(value) )
type_id.SetArrayElement( decoded_object, index, _InitializeArray( json_child_array, settings, element_type_id ))
End If
index :+ 1
Expand Down Expand Up @@ -490,7 +518,17 @@ Type JSON
Case ARRAY_END
Throw("IGNORE")
End Select
Throw( "Error: could not parse encoded JSON data at position "+(cursor-1) )
If _IsAlphaNumericOrUnderscore( encoded_json_data[cursor] )
Local try_unquoted_string$ = _DecodeJSONUnquotedString( encoded_json_data, cursor )
If try_unquoted_string Then Return try_unquoted_string
EndIf
Select char 'trailing comma, ignore error and continue
Case OBJECT_END
Throw("IGNORE")
Case ARRAY_END
Throw("IGNORE")
End Select
Throw( " Error: could not parse encoded JSON data at position "+(cursor-1) )
End Function

Function _DecodeJSONObject:TMap( encoded_json_data:String, cursor:Int Var )
Expand All @@ -500,7 +538,7 @@ Type JSON
If cursor >= (encoded_json_data.Length) Then Return Null
char = Chr(encoded_json_data[cursor]); cursor :+ 1
If char <> OBJECT_BEGIN
Throw( "Error: expected open-curly-brace character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Throw( " Error: expected open-curly-brace character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
Local member_pair_name$, member_pair_value:Object
Expand All @@ -512,7 +550,7 @@ Type JSON
If cursor >= (encoded_json_data.Length) Then Exit
char = Chr(encoded_json_data[cursor]); cursor :+ 1
If char <> PAIR_SEPARATOR
Throw( "Error: expected colon character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Throw( " Error: expected colon character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
_EatWhitespace( encoded_json_data, cursor )
Expand All @@ -521,14 +559,15 @@ Type JSON
_EatWhitespace( encoded_json_data, cursor )
If cursor >= (encoded_json_data.Length) Then Exit
char = Chr(encoded_json_data[cursor]); cursor :+ 1
If char <> VALUE_SEPARATOR And char <> OBJECT_END
Throw( "Error: expected comma or close-curly-brace character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
If char <> VALUE_SEPARATOR And char <> VALUE_SEPARATOR_ALTERNATE And char <> OBJECT_END
Throw( " Error: expected comma or semicolon or close-curly-brace character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
Until char = OBJECT_END Or cursor >= (encoded_json_data.Length - 1)
Catch ex$
If ex = "IGNORE" Then DebugLog "Warning: trailing comma ignored" ..
Else Throw ex
'If ex = "IGNORE" Then DebugLog " Warning: trailing comma ignored" ..
'Else Throw ex
If ex <> "IGNORE" Then Throw ex
End Try
Return json_object
End Function
Expand All @@ -540,7 +579,7 @@ Type JSON
If cursor >= (encoded_json_data.Length) Then Return Null
char = Chr(encoded_json_data[cursor]); cursor :+ 1
If char <> ARRAY_BEGIN
Throw( "Error: expected open-square-bracket character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Throw( " Error: expected open-square-bracket character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
Local element_value:Object
Expand All @@ -550,14 +589,15 @@ Type JSON
element_value = _DecodeJSONValue( encoded_json_data, cursor )
json_array.AddLast( element_value )
Catch ex$
If ex = "IGNORE" Then DebugLog "Warning: trailing comma ignored" ..
Else Throw ex
'If ex = "IGNORE" Then DebugLog " Warning: trailing comma ignored" ..
'Else Throw ex
If ex <> "IGNORE" Then Throw ex
End Try
_EatWhitespace( encoded_json_data, cursor )
If cursor >= (encoded_json_data.Length) Then Exit
char = Chr(encoded_json_data[cursor]); cursor :+ 1
If char <> VALUE_SEPARATOR And char <> ARRAY_END
Throw( "Error: expected comma or close-square-bracket character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
If char <> VALUE_SEPARATOR And char <> VALUE_SEPARATOR_ALTERNATE And char <> ARRAY_END
Throw( " Error: expected comma or semicolon or close-square-bracket character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
Until char = ARRAY_END Or cursor >= (encoded_json_data.Length - 1)
Expand All @@ -577,7 +617,7 @@ Type JSON
Throw("IGNORE")
End Select
If char <> STRING_BEGIN
Throw( "Error: expected quotation character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Throw( " Error: expected quotation character at position "+(cursor-1)+_ShowPosition(encoded_json_data, cursor) )
Return Null
End If
Repeat
Expand All @@ -589,7 +629,7 @@ Type JSON
json_string :+ char
Else
If cursor >= (encoded_json_data.Length - 1)
Throw( "Error: unterminated string literal" )
Throw( " Error: unterminated string literal" )
Return Null
End If
char_temp = Chr(encoded_json_data[cursor]); cursor :+ 1
Expand All @@ -612,13 +652,33 @@ Type JSON
'ignore
cursor :+ 4
Default
Throw( "Error: bad string escape sequence at position "+(cursor-1) )
Throw( " Error: bad string escape sequence at position "+(cursor-1) )
Return Null
End Select
End If
Until cursor >= (encoded_json_data.Length - 1)
Return json_string
End Function

Function _DecodeJSONUnquotedString:String( encoded_json_data:String, cursor:Int Var )
Local json_string$ = ""
_EatWhitespace( encoded_json_data, cursor )
Local char$
If cursor >= (encoded_json_data.Length) Then Return Null
char = Chr( encoded_json_data[cursor] );
cursor :+ 1
json_string :+ char
Repeat
char = Chr( encoded_json_data[cursor] );
If Not _IsAlphaNumericOrUnderscore( char )
Exit
End If
cursor :+ 1
json_string :+ char
Until cursor >= (encoded_json_data.Length - 1)
'DebugLog " Notify: Unquoted string found: "+json_string
Return json_string
End Function

'TJSONLong, TJSONDouble
Function _DecodeJSONNumber:Object( encoded_json_data:String, cursor:Int Var )
Expand Down Expand Up @@ -683,7 +743,7 @@ Type JSON
End If
End While
If require <> -1 And (cursor - cursor_start) < require
Throw( "Error: expected at least "+require+" characters from the set ["+char_filter+"]" )
Throw( " Error: expected at least "+require+" characters from the set ["+char_filter+"]" )
End If
Return cursor - cursor_start
End Function
Expand All @@ -707,8 +767,16 @@ Type JSON

Function _IsAlpha%( char$ )
Local ascii_code% = Asc( char )
Return ascii_code >= Asc( "A" ) And ascii_code <= Asc( "Z" ) ..
Or ascii_code >= Asc( "a" ) And ascii_code <= Asc( "z" )
Return (ascii_code >= Asc( "A" ) And ascii_code <= Asc( "Z" )) ..
Or (ascii_code >= Asc( "a" ) And ascii_code <= Asc( "z" ))
End Function

Function _IsAlphaNumericOrUnderscore%( char$ )
Local ascii_code% = Asc( char )
Return (ascii_code >= Asc( "A" ) And ascii_code <= Asc( "Z" )) ..
Or (ascii_code >= Asc( "a" ) And ascii_code <= Asc( "z" )) ..
Or (ascii_code >= Asc( "0" ) And ascii_code <= Asc( "9" )) ..
Or ascii_code = Asc( "_" )
End Function

Function _IsPrintable%( char$ )
Expand All @@ -724,6 +792,7 @@ Type JSON
Const ARRAY_BEGIN$ = "["
Const ARRAY_END$ = "]"
Const VALUE_SEPARATOR$ = ","
Const VALUE_SEPARATOR_ALTERNATE$ = ";"
Const VALUE_TRUE$ = "true"
Const VALUE_FALSE$ = "false"
Const VALUE_NULL$ = "null"
Expand Down

0 comments on commit 5e34469

Please sign in to comment.