update format for table objects

fangq · fangq · commit fb5b240a9636 · 2019-06-24T19:40:05.000-04:00
diff --git a/examples/jsonlab_basictest.matlab b/examples/jsonlab_basictest.matlab
@@ -1166,7 +1166,7 @@ ans =
 		"Hour": 0,
 		"Minute": 0,
 		"Second": 0,
-		"SystemTimeZone": "America\/Los_Angeles"
+		"SystemTimeZone": "America\/New_York"
 	},
 	{
 		"Format": "dd-MMM-uuuu",
@@ -1177,7 +1177,7 @@ ans =
 		"Hour": 0,
 		"Minute": 0,
 		"Second": 0,
-		"SystemTimeZone": "America\/Los_Angeles"
+		"SystemTimeZone": "America\/New_York"
 	}
 ]
 
@@ -1237,33 +1237,34 @@ data2json =
 ans =
 
 {
-	"table": [
-		{
-			"Names": [
-				"Andy"
-			],
-			"Age": 21
-		},
-		{
-			"Names": [
-				"William"
+	"table": {
+		"_TableCols_": [
+			"Names",
+			"Age"
+		],
+		"_TableRecords_": [
+			[
+				"Andy",
+				21
 			],
-			"Age": 21
-		},
-		{
-			"Names": [
-				"Om"
+			[
+				"William",
+				21
 			],
-			"Age": 22
-		}
-	]
+			[
+				"Om",
+				22
+			]
+		],
+		"_TableRows_": []
+	}
 }
 
 
 
 json2data = 
 
-    table: {[1x1 struct]  [1x1 struct]  [1x1 struct]}
+    table: [3x2 table]
 
 >> >> 
 %=================================================
diff --git a/examples/jsonlab_ubjson_basictest.matlab b/examples/jsonlab_ubjson_basictest.matlab
@@ -725,7 +725,7 @@ data2json =
 
 ans =
 
-[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayiUHouri UMinutei USecondi USystemTimeZoneSUAmerica/Los_Angeles}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayi	UHouri UMinutei USecondi USystemTimeZoneSUAmerica/Los_Angeles}]
+[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayiUHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayi	UHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}]
 
 
 json2data = 
@@ -776,12 +776,12 @@ data2json =
 
 ans =
 
-{Utable[{UNames[SUAndy]UAgei}{UNames[SUWilliam]UAgei}{UNames[SUOm]UAgei}]}
+{Utable{U_TableCols_[SUNamesSUAge]U_TableRecords_[[SUAndy[i]][SUWilliam[i]][SUOm[i]]]U_TableRows_Z}}
 
 
 json2data = 
 
-    table: {[1x1 struct]  [1x1 struct]  [1x1 struct]}
+    table: [3x2 table]
 
 >> >> 
 %=================================================

-Original file line number
+Diff line change
 ans =
 -[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayiUHouri UMinutei USecondi USystemTimeZoneSUAmerica/Los_Angeles}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayi	UHouri UMinutei USecondi USystemTimeZoneSUAmerica/Los_Angeles}]
 +[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayiUHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayi	UHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}]
 json2data =
 ans =
 -{Utable[{UNames[SUAndy]UAgei}{UNames[SUWilliam]UAgei}{UNames[SUOm]UAgei}]}
 +{Utable{U_TableCols_[SUNamesSUAge]U_TableRecords_[[SUAndy[i]][SUWilliam[i]][SUOm[i]]]U_TableRows_Z}}
 json2data =
 -    table: {[1x1 struct]  [1x1 struct]  [1x1 struct]}
 +    table: [3x2 table]
 >> >>
 %=================================================