diff options
Diffstat (limited to 'ddl/out/java/LambdaCube')
57 files changed, 130 insertions, 84 deletions
diff --git a/ddl/out/java/LambdaCube/IR/AccumulationContext.java b/ddl/out/java/LambdaCube/IR/AccumulationContext.java index 3c6b021..22d1e22 100644 --- a/ddl/out/java/LambdaCube/IR/AccumulationContext.java +++ b/ddl/out/java/LambdaCube/IR/AccumulationContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ArrayValue.java b/ddl/out/java/LambdaCube/IR/ArrayValue.java index b28362d..5c607e5 100644 --- a/ddl/out/java/LambdaCube/IR/ArrayValue.java +++ b/ddl/out/java/LambdaCube/IR/ArrayValue.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Backend.java b/ddl/out/java/LambdaCube/IR/Backend.java index bd0921a..b938596 100644 --- a/ddl/out/java/LambdaCube/IR/Backend.java +++ b/ddl/out/java/LambdaCube/IR/Backend.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendEquation.java b/ddl/out/java/LambdaCube/IR/BlendEquation.java index 4c7e398..d846193 100644 --- a/ddl/out/java/LambdaCube/IR/BlendEquation.java +++ b/ddl/out/java/LambdaCube/IR/BlendEquation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Blending.java b/ddl/out/java/LambdaCube/IR/Blending.java index cafc0c2..57d4e27 100644 --- a/ddl/out/java/LambdaCube/IR/Blending.java +++ b/ddl/out/java/LambdaCube/IR/Blending.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/BlendingFactor.java b/ddl/out/java/LambdaCube/IR/BlendingFactor.java index 2930fa2..86b6360 100644 --- a/ddl/out/java/LambdaCube/IR/BlendingFactor.java +++ b/ddl/out/java/LambdaCube/IR/BlendingFactor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ClearImage.java b/ddl/out/java/LambdaCube/IR/ClearImage.java index b6960d8..7c9579b 100644 --- a/ddl/out/java/LambdaCube/IR/ClearImage.java +++ b/ddl/out/java/LambdaCube/IR/ClearImage.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ColorArity.java b/ddl/out/java/LambdaCube/IR/ColorArity.java index f196e21..4566db2 100644 --- a/ddl/out/java/LambdaCube/IR/ColorArity.java +++ b/ddl/out/java/LambdaCube/IR/ColorArity.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Command.java b/ddl/out/java/LambdaCube/IR/Command.java index b26e4dc..b073a1b 100644 --- a/ddl/out/java/LambdaCube/IR/Command.java +++ b/ddl/out/java/LambdaCube/IR/Command.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java index 39f46cc..be3bfbe 100644 --- a/ddl/out/java/LambdaCube/IR/ComparisonFunction.java +++ b/ddl/out/java/LambdaCube/IR/ComparisonFunction.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/CullMode.java b/ddl/out/java/LambdaCube/IR/CullMode.java index 1c14f58..711057d 100644 --- a/ddl/out/java/LambdaCube/IR/CullMode.java +++ b/ddl/out/java/LambdaCube/IR/CullMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/EdgeMode.java b/ddl/out/java/LambdaCube/IR/EdgeMode.java index ec84095..dc1112b 100644 --- a/ddl/out/java/LambdaCube/IR/EdgeMode.java +++ b/ddl/out/java/LambdaCube/IR/EdgeMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java index 3d69090..c078d9a 100644 --- a/ddl/out/java/LambdaCube/IR/FetchPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/FetchPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Filter.java b/ddl/out/java/LambdaCube/IR/Filter.java index 815fe1e..b532891 100644 --- a/ddl/out/java/LambdaCube/IR/Filter.java +++ b/ddl/out/java/LambdaCube/IR/Filter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FragmentOperation.java b/ddl/out/java/LambdaCube/IR/FragmentOperation.java index a464138..961659c 100644 --- a/ddl/out/java/LambdaCube/IR/FragmentOperation.java +++ b/ddl/out/java/LambdaCube/IR/FragmentOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/FrontFace.java b/ddl/out/java/LambdaCube/IR/FrontFace.java index 62f781b..6fea9cd 100644 --- a/ddl/out/java/LambdaCube/IR/FrontFace.java +++ b/ddl/out/java/LambdaCube/IR/FrontFace.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageRef.java b/ddl/out/java/LambdaCube/IR/ImageRef.java index 213ffb2..33978e2 100644 --- a/ddl/out/java/LambdaCube/IR/ImageRef.java +++ b/ddl/out/java/LambdaCube/IR/ImageRef.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ImageSemantic.java b/ddl/out/java/LambdaCube/IR/ImageSemantic.java index 60494ec..595d17e 100644 --- a/ddl/out/java/LambdaCube/IR/ImageSemantic.java +++ b/ddl/out/java/LambdaCube/IR/ImageSemantic.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/InputType.java b/ddl/out/java/LambdaCube/IR/InputType.java index 1584b71..423453e 100644 --- a/ddl/out/java/LambdaCube/IR/InputType.java +++ b/ddl/out/java/LambdaCube/IR/InputType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/JSON.java b/ddl/out/java/LambdaCube/IR/JSON.java index 2710e28..d3d5e4e 100644 --- a/ddl/out/java/LambdaCube/IR/JSON.java +++ b/ddl/out/java/LambdaCube/IR/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
@@ -115,11 +115,11 @@ public class JSON { | |||
115 | 115 | ||
116 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { | 116 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { |
117 | switch (type) { | 117 | switch (type) { |
118 | case Int: return (Integer)rawObj; | 118 | case Int: return ((Number)rawObj).intValue(); |
119 | case Int32: return (Integer)rawObj; | 119 | case Int32: return ((Number)rawObj).intValue(); |
120 | case Word: return (Integer)rawObj; | 120 | case Word: return ((Number)rawObj).intValue(); |
121 | case Word32: return (Integer)rawObj; | 121 | case Word32: return ((Number)rawObj).intValue(); |
122 | case Float: return (Float)rawObj; | 122 | case Float: return ((Number)rawObj).floatValue(); |
123 | case Bool: return (Boolean)rawObj; | 123 | case Bool: return (Boolean)rawObj; |
124 | case String: return (String)rawObj; | 124 | case String: return (String)rawObj; |
125 | case V2_Int: { | 125 | case V2_Int: { |
@@ -419,68 +419,62 @@ public class JSON { | |||
419 | return v; | 419 | return v; |
420 | } | 420 | } |
421 | case Maybe_Int: { | 421 | case Maybe_Int: { |
422 | JSONObject obj = (JSONObject)rawObj; | ||
423 | Maybe<Integer> m = new Maybe<Integer> (); | 422 | Maybe<Integer> m = new Maybe<Integer> (); |
424 | if (obj == null || obj == JSONObject.NULL) { | 423 | if (rawObj == null || rawObj == JSONObject.NULL) { |
425 | m.valid = false; | 424 | m.valid = false; |
426 | } else { | 425 | } else { |
427 | m.valid = true; | 426 | m.valid = true; |
428 | m.data = (Integer)fromJSON (Type.Int,obj); | 427 | m.data = (Integer)fromJSON (Type.Int,(JSONObject)rawObj); |
429 | } | 428 | } |
430 | return m; | 429 | return m; |
431 | } | 430 | } |
432 | case Maybe_Float: { | 431 | case Maybe_Float: { |
433 | JSONObject obj = (JSONObject)rawObj; | ||
434 | Maybe<Float> m = new Maybe<Float> (); | 432 | Maybe<Float> m = new Maybe<Float> (); |
435 | if (obj == null || obj == JSONObject.NULL) { | 433 | if (rawObj == null || rawObj == JSONObject.NULL) { |
436 | m.valid = false; | 434 | m.valid = false; |
437 | } else { | 435 | } else { |
438 | m.valid = true; | 436 | m.valid = true; |
439 | m.data = (Float)fromJSON (Type.Float,obj); | 437 | m.data = (Float)fromJSON (Type.Float,(JSONObject)rawObj); |
440 | } | 438 | } |
441 | return m; | 439 | return m; |
442 | } | 440 | } |
443 | case Maybe_String: { | 441 | case Maybe_String: { |
444 | JSONObject obj = (JSONObject)rawObj; | ||
445 | Maybe<String> m = new Maybe<String> (); | 442 | Maybe<String> m = new Maybe<String> (); |
446 | if (obj == null || obj == JSONObject.NULL) { | 443 | if (rawObj == null || rawObj == JSONObject.NULL) { |
447 | m.valid = false; | 444 | m.valid = false; |
448 | } else { | 445 | } else { |
449 | m.valid = true; | 446 | m.valid = true; |
450 | m.data = (String)fromJSON (Type.String,obj); | 447 | m.data = (String)fromJSON (Type.String,(JSONObject)rawObj); |
451 | } | 448 | } |
452 | return m; | 449 | return m; |
453 | } | 450 | } |
454 | case Maybe_ComparisonFunction: { | 451 | case Maybe_ComparisonFunction: { |
455 | JSONObject obj = (JSONObject)rawObj; | ||
456 | Maybe<ComparisonFunction> m = new Maybe<ComparisonFunction> (); | 452 | Maybe<ComparisonFunction> m = new Maybe<ComparisonFunction> (); |
457 | if (obj == null || obj == JSONObject.NULL) { | 453 | if (rawObj == null || rawObj == JSONObject.NULL) { |
458 | m.valid = false; | 454 | m.valid = false; |
459 | } else { | 455 | } else { |
460 | m.valid = true; | 456 | m.valid = true; |
461 | m.data = (ComparisonFunction)fromJSON (Type.ComparisonFunction,obj); | 457 | m.data = (ComparisonFunction)fromJSON (Type.ComparisonFunction,(JSONObject)rawObj); |
462 | } | 458 | } |
463 | return m; | 459 | return m; |
464 | } | 460 | } |
465 | case Maybe_EdgeMode: { | 461 | case Maybe_EdgeMode: { |
466 | JSONObject obj = (JSONObject)rawObj; | ||
467 | Maybe<EdgeMode> m = new Maybe<EdgeMode> (); | 462 | Maybe<EdgeMode> m = new Maybe<EdgeMode> (); |
468 | if (obj == null || obj == JSONObject.NULL) { | 463 | if (rawObj == null || rawObj == JSONObject.NULL) { |
469 | m.valid = false; | 464 | m.valid = false; |
470 | } else { | 465 | } else { |
471 | m.valid = true; | 466 | m.valid = true; |
472 | m.data = (EdgeMode)fromJSON (Type.EdgeMode,obj); | 467 | m.data = (EdgeMode)fromJSON (Type.EdgeMode,(JSONObject)rawObj); |
473 | } | 468 | } |
474 | return m; | 469 | return m; |
475 | } | 470 | } |
476 | case Maybe_ImageRef: { | 471 | case Maybe_ImageRef: { |
477 | JSONObject obj = (JSONObject)rawObj; | ||
478 | Maybe<ImageRef> m = new Maybe<ImageRef> (); | 472 | Maybe<ImageRef> m = new Maybe<ImageRef> (); |
479 | if (obj == null || obj == JSONObject.NULL) { | 473 | if (rawObj == null || rawObj == JSONObject.NULL) { |
480 | m.valid = false; | 474 | m.valid = false; |
481 | } else { | 475 | } else { |
482 | m.valid = true; | 476 | m.valid = true; |
483 | m.data = (ImageRef)fromJSON (Type.ImageRef,obj); | 477 | m.data = (ImageRef)fromJSON (Type.ImageRef,(JSONObject)rawObj); |
484 | } | 478 | } |
485 | return m; | 479 | return m; |
486 | } | 480 | } |
@@ -3002,10 +2996,20 @@ public class JSON { | |||
3002 | return obj; | 2996 | return obj; |
3003 | } | 2997 | } |
3004 | 2998 | ||
2999 | case Int: { return rawObj; } | ||
3000 | case Int32: { return rawObj; } | ||
3001 | case Word: { return rawObj; } | ||
3005 | case Word32: { return rawObj; } | 3002 | case Word32: { return rawObj; } |
3006 | case Float: { return rawObj; } | 3003 | case Float: { return rawObj; } |
3007 | case Bool: { return rawObj; } | 3004 | case Bool: { return rawObj; } |
3008 | case String: { return rawObj; } | 3005 | case String: { return rawObj; } |
3006 | case V2_Int: { | ||
3007 | V2<Integer> v = (V2<Integer>)rawObj; | ||
3008 | JSONObject obj = new JSONObject(); | ||
3009 | obj.put("x", toJSON(Type.Int,v.x)); | ||
3010 | obj.put("y", toJSON(Type.Int,v.y)); | ||
3011 | return obj; | ||
3012 | } | ||
3009 | case V2_Word: { | 3013 | case V2_Word: { |
3010 | V2<Integer> v = (V2<Integer>)rawObj; | 3014 | V2<Integer> v = (V2<Integer>)rawObj; |
3011 | JSONObject obj = new JSONObject(); | 3015 | JSONObject obj = new JSONObject(); |
@@ -3048,6 +3052,14 @@ public class JSON { | |||
3048 | obj.put("y", toJSON(Type.V4_Float,v.y)); | 3052 | obj.put("y", toJSON(Type.V4_Float,v.y)); |
3049 | return obj; | 3053 | return obj; |
3050 | } | 3054 | } |
3055 | case V3_Int: { | ||
3056 | V3<Integer> v = (V3<Integer>)rawObj; | ||
3057 | JSONObject obj = new JSONObject(); | ||
3058 | obj.put("x", toJSON(Type.Int,v.x)); | ||
3059 | obj.put("y", toJSON(Type.Int,v.y)); | ||
3060 | obj.put("z", toJSON(Type.Int,v.z)); | ||
3061 | return obj; | ||
3062 | } | ||
3051 | case V3_Word: { | 3063 | case V3_Word: { |
3052 | V3<Integer> v = (V3<Integer>)rawObj; | 3064 | V3<Integer> v = (V3<Integer>)rawObj; |
3053 | JSONObject obj = new JSONObject(); | 3065 | JSONObject obj = new JSONObject(); |
@@ -3096,6 +3108,15 @@ public class JSON { | |||
3096 | obj.put("z", toJSON(Type.V4_Float,v.z)); | 3108 | obj.put("z", toJSON(Type.V4_Float,v.z)); |
3097 | return obj; | 3109 | return obj; |
3098 | } | 3110 | } |
3111 | case V4_Int: { | ||
3112 | V4<Integer> v = (V4<Integer>)rawObj; | ||
3113 | JSONObject obj = new JSONObject(); | ||
3114 | obj.put("x", toJSON(Type.Int,v.x)); | ||
3115 | obj.put("y", toJSON(Type.Int,v.y)); | ||
3116 | obj.put("z", toJSON(Type.Int,v.z)); | ||
3117 | obj.put("w", toJSON(Type.Int,v.w)); | ||
3118 | return obj; | ||
3119 | } | ||
3099 | case V4_Word: { | 3120 | case V4_Word: { |
3100 | V4<Integer> v = (V4<Integer>)rawObj; | 3121 | V4<Integer> v = (V4<Integer>)rawObj; |
3101 | JSONObject obj = new JSONObject(); | 3122 | JSONObject obj = new JSONObject(); |
@@ -3150,6 +3171,22 @@ public class JSON { | |||
3150 | obj.put("w", toJSON(Type.V4_Float,v.w)); | 3171 | obj.put("w", toJSON(Type.V4_Float,v.w)); |
3151 | return obj; | 3172 | return obj; |
3152 | } | 3173 | } |
3174 | case Array_Int: { | ||
3175 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | ||
3176 | JSONArray obj = new JSONArray(); | ||
3177 | for(Integer i : v) { | ||
3178 | obj.put(toJSON(Type.Int,i)); | ||
3179 | } | ||
3180 | return obj; | ||
3181 | } | ||
3182 | case Array_Int32: { | ||
3183 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | ||
3184 | JSONArray obj = new JSONArray(); | ||
3185 | for(Integer i : v) { | ||
3186 | obj.put(toJSON(Type.Int32,i)); | ||
3187 | } | ||
3188 | return obj; | ||
3189 | } | ||
3153 | case Array_Word32: { | 3190 | case Array_Word32: { |
3154 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | 3191 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; |
3155 | JSONArray obj = new JSONArray(); | 3192 | JSONArray obj = new JSONArray(); |
diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 4f71624..505aa61 100644 --- a/ddl/out/java/LambdaCube/IR/LogicOperation.java +++ b/ddl/out/java/LambdaCube/IR/LogicOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/MipMap.java b/ddl/out/java/LambdaCube/IR/MipMap.java index 585bf4a..03469f6 100644 --- a/ddl/out/java/LambdaCube/IR/MipMap.java +++ b/ddl/out/java/LambdaCube/IR/MipMap.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java index a50cbf1..710e612 100644 --- a/ddl/out/java/LambdaCube/IR/OutputPrimitive.java +++ b/ddl/out/java/LambdaCube/IR/OutputPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Parameter.java b/ddl/out/java/LambdaCube/IR/Parameter.java index 59f9f25..e1aa0e1 100644 --- a/ddl/out/java/LambdaCube/IR/Parameter.java +++ b/ddl/out/java/LambdaCube/IR/Parameter.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Pipeline.java b/ddl/out/java/LambdaCube/IR/Pipeline.java index 3702a6b..ee00e23 100644 --- a/ddl/out/java/LambdaCube/IR/Pipeline.java +++ b/ddl/out/java/LambdaCube/IR/Pipeline.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSize.java b/ddl/out/java/LambdaCube/IR/PointSize.java index 79ea789..d7c8551 100644 --- a/ddl/out/java/LambdaCube/IR/PointSize.java +++ b/ddl/out/java/LambdaCube/IR/PointSize.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java index 2bb15a3..28d408a 100644 --- a/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java +++ b/ddl/out/java/LambdaCube/IR/PointSpriteCoordOrigin.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonMode.java b/ddl/out/java/LambdaCube/IR/PolygonMode.java index f039d7e..504604d 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonMode.java +++ b/ddl/out/java/LambdaCube/IR/PolygonMode.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/PolygonOffset.java b/ddl/out/java/LambdaCube/IR/PolygonOffset.java index 2ebb443..4e66be8 100644 --- a/ddl/out/java/LambdaCube/IR/PolygonOffset.java +++ b/ddl/out/java/LambdaCube/IR/PolygonOffset.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Program.java b/ddl/out/java/LambdaCube/IR/Program.java index 35dda67..680e8be 100644 --- a/ddl/out/java/LambdaCube/IR/Program.java +++ b/ddl/out/java/LambdaCube/IR/Program.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java index 2af20fe..9224932 100644 --- a/ddl/out/java/LambdaCube/IR/ProvokingVertex.java +++ b/ddl/out/java/LambdaCube/IR/ProvokingVertex.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RasterContext.java b/ddl/out/java/LambdaCube/IR/RasterContext.java index ea4e6c6..3510d82 100644 --- a/ddl/out/java/LambdaCube/IR/RasterContext.java +++ b/ddl/out/java/LambdaCube/IR/RasterContext.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/RenderTarget.java b/ddl/out/java/LambdaCube/IR/RenderTarget.java index 86c1742..e6fa397 100644 --- a/ddl/out/java/LambdaCube/IR/RenderTarget.java +++ b/ddl/out/java/LambdaCube/IR/RenderTarget.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java index 3f1e0ef..1bf46b0 100644 --- a/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/SamplerDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Slot.java b/ddl/out/java/LambdaCube/IR/Slot.java index c986d90..462ec2a 100644 --- a/ddl/out/java/LambdaCube/IR/Slot.java +++ b/ddl/out/java/LambdaCube/IR/Slot.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOperation.java b/ddl/out/java/LambdaCube/IR/StencilOperation.java index 164b122..974062a 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOperation.java +++ b/ddl/out/java/LambdaCube/IR/StencilOperation.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilOps.java b/ddl/out/java/LambdaCube/IR/StencilOps.java index 4d0baa5..fd2f166 100644 --- a/ddl/out/java/LambdaCube/IR/StencilOps.java +++ b/ddl/out/java/LambdaCube/IR/StencilOps.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTest.java b/ddl/out/java/LambdaCube/IR/StencilTest.java index 52707d1..08c87a2 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTest.java +++ b/ddl/out/java/LambdaCube/IR/StencilTest.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StencilTests.java b/ddl/out/java/LambdaCube/IR/StencilTests.java index 8f98f0b..8467dc8 100644 --- a/ddl/out/java/LambdaCube/IR/StencilTests.java +++ b/ddl/out/java/LambdaCube/IR/StencilTests.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/StreamData.java b/ddl/out/java/LambdaCube/IR/StreamData.java index 23c7f99..cdee011 100644 --- a/ddl/out/java/LambdaCube/IR/StreamData.java +++ b/ddl/out/java/LambdaCube/IR/StreamData.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TargetItem.java b/ddl/out/java/LambdaCube/IR/TargetItem.java index 13bb985..baa38dc 100644 --- a/ddl/out/java/LambdaCube/IR/TargetItem.java +++ b/ddl/out/java/LambdaCube/IR/TargetItem.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDataType.java b/ddl/out/java/LambdaCube/IR/TextureDataType.java index 77c0d78..b6b55d7 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDataType.java +++ b/ddl/out/java/LambdaCube/IR/TextureDataType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java index f4cfa1e..f2d6323 100644 --- a/ddl/out/java/LambdaCube/IR/TextureDescriptor.java +++ b/ddl/out/java/LambdaCube/IR/TextureDescriptor.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/TextureType.java b/ddl/out/java/LambdaCube/IR/TextureType.java index 823a99d..7fa1d8f 100644 --- a/ddl/out/java/LambdaCube/IR/TextureType.java +++ b/ddl/out/java/LambdaCube/IR/TextureType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/IR/Value.java b/ddl/out/java/LambdaCube/IR/Value.java index 3fb3ec0..8d3e45d 100644 --- a/ddl/out/java/LambdaCube/IR/Value.java +++ b/ddl/out/java/LambdaCube/IR/Value.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:12.412728000000Z | 2 | // 2016-04-01T16:25:34.381854000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/JSON.java b/ddl/out/java/LambdaCube/Mesh/JSON.java index f878c4e..b19b4e2 100644 --- a/ddl/out/java/LambdaCube/Mesh/JSON.java +++ b/ddl/out/java/LambdaCube/Mesh/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
@@ -41,9 +41,9 @@ public class JSON { | |||
41 | 41 | ||
42 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { | 42 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { |
43 | switch (type) { | 43 | switch (type) { |
44 | case Int32: return (Integer)rawObj; | 44 | case Int32: return ((Number)rawObj).intValue(); |
45 | case Word32: return (Integer)rawObj; | 45 | case Word32: return ((Number)rawObj).intValue(); |
46 | case Float: return (Float)rawObj; | 46 | case Float: return ((Number)rawObj).floatValue(); |
47 | case String: return (String)rawObj; | 47 | case String: return (String)rawObj; |
48 | case V2_Float: { | 48 | case V2_Float: { |
49 | JSONObject obj = (JSONObject)rawObj; | 49 | JSONObject obj = (JSONObject)rawObj; |
@@ -387,6 +387,7 @@ public class JSON { | |||
387 | return obj; | 387 | return obj; |
388 | } | 388 | } |
389 | 389 | ||
390 | case Int32: { return rawObj; } | ||
390 | case Word32: { return rawObj; } | 391 | case Word32: { return rawObj; } |
391 | case Float: { return rawObj; } | 392 | case Float: { return rawObj; } |
392 | case String: { return rawObj; } | 393 | case String: { return rawObj; } |
@@ -438,6 +439,14 @@ public class JSON { | |||
438 | obj.put("w", toJSON(Type.V4_Float,v.w)); | 439 | obj.put("w", toJSON(Type.V4_Float,v.w)); |
439 | return obj; | 440 | return obj; |
440 | } | 441 | } |
442 | case Array_Int32: { | ||
443 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | ||
444 | JSONArray obj = new JSONArray(); | ||
445 | for(Integer i : v) { | ||
446 | obj.put(toJSON(Type.Int32,i)); | ||
447 | } | ||
448 | return obj; | ||
449 | } | ||
441 | case Array_Word32: { | 450 | case Array_Word32: { |
442 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; | 451 | ArrayList<Integer> v = (ArrayList<Integer>)rawObj; |
443 | JSONArray obj = new JSONArray(); | 452 | JSONArray obj = new JSONArray(); |
diff --git a/ddl/out/java/LambdaCube/Mesh/Mesh.java b/ddl/out/java/LambdaCube/Mesh/Mesh.java index 8b62ab7..db5fc0a 100644 --- a/ddl/out/java/LambdaCube/Mesh/Mesh.java +++ b/ddl/out/java/LambdaCube/Mesh/Mesh.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java index a29a371..a2982b3 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshAttribute.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java index f334a71..909e9bd 100644 --- a/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java +++ b/ddl/out/java/LambdaCube/Mesh/MeshPrimitive.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.232726000000Z | 2 | // 2016-04-01T16:25:35.222504000000Z |
3 | 3 | ||
4 | package LambdaCube.Mesh; | 4 | package LambdaCube.Mesh; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java index 29e9567..7e06c4e 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/JSON.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.180467000000Z | 2 | // 2016-04-01T16:25:35.172905000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java index dcc498a..13ff8c2 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/ObjectArraySchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.180467000000Z | 2 | // 2016-04-01T16:25:35.172905000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java index 392d71e..631b01c 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/PipelineSchema.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.180467000000Z | 2 | // 2016-04-01T16:25:35.172905000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java index 990023d..41cef93 100644 --- a/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java +++ b/ddl/out/java/LambdaCube/PipelineSchema/StreamType.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.180467000000Z | 2 | // 2016-04-01T16:25:35.172905000000Z |
3 | 3 | ||
4 | package LambdaCube.PipelineSchema; | 4 | package LambdaCube.PipelineSchema; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java index 1384d75..36bba0d 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java +++ b/ddl/out/java/LambdaCube/TypeInfo/CompileResult.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.322407000000Z | 2 | // 2016-04-01T16:25:35.327304000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/JSON.java b/ddl/out/java/LambdaCube/TypeInfo/JSON.java index 59498c6..6491702 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/JSON.java +++ b/ddl/out/java/LambdaCube/TypeInfo/JSON.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.322407000000Z | 2 | // 2016-04-01T16:25:35.327304000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
@@ -27,7 +27,7 @@ public class JSON { | |||
27 | 27 | ||
28 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { | 28 | public static Object fromJSON(Type type, Object rawObj) throws JSONException, Exception { |
29 | switch (type) { | 29 | switch (type) { |
30 | case Int: return (Integer)rawObj; | 30 | case Int: return ((Number)rawObj).intValue(); |
31 | case String: return (String)rawObj; | 31 | case String: return (String)rawObj; |
32 | case Array_Range: { | 32 | case Array_Range: { |
33 | JSONArray obj = (JSONArray)rawObj; | 33 | JSONArray obj = (JSONArray)rawObj; |
diff --git a/ddl/out/java/LambdaCube/TypeInfo/Range.java b/ddl/out/java/LambdaCube/TypeInfo/Range.java index c0ab81b..c5de275 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/Range.java +++ b/ddl/out/java/LambdaCube/TypeInfo/Range.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.322407000000Z | 2 | // 2016-04-01T16:25:35.327304000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||
diff --git a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java index 3975008..2e966f7 100644 --- a/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java +++ b/ddl/out/java/LambdaCube/TypeInfo/TypeInfo.java | |||
@@ -1,5 +1,5 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-29T11:30:13.322407000000Z | 2 | // 2016-04-01T16:25:35.327304000000Z |
3 | 3 | ||
4 | package LambdaCube.TypeInfo; | 4 | package LambdaCube.TypeInfo; |
5 | 5 | ||