diff options
Diffstat (limited to 'ddl/out/java/LambdaCube/IR')
45 files changed, 210 insertions, 103 deletions
diff --git a/ddl/out/java/LambdaCube/IR/AccumulationContext.java b/ddl/out/java/LambdaCube/IR/AccumulationContext.java index 4b35c4c..47e92cc 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 4bdf944..df0d096 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 dcc58d7..8a395af 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 138f3cb..c6712d3 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d30b963..f3e1e48 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 8c02971..b45483b 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 48fdbe1..de88625 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 dee0704..1a89df1 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 407059f..4a1c915 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 ecd2947..d64cd26 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 10f7630..bd462ef 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 1c597a6..280ed53 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 bfd60ee..89bc1a5 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 19e692b..19d9a39 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 42c5738..65d284f 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 fca8e14..6d5323d 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 1da3948..bc382bc 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 b17b954..4777479 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 38e1cdb..48d42c1 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 f5f7967..a25af3d 100644 --- a/ddl/out/java/LambdaCube/IR/JSON.java +++ b/ddl/out/java/LambdaCube/IR/JSON.java | |||
@@ -1,10 +1,11 @@ | |||
1 | // generated file, do not modify! | 1 | // generated file, do not modify! |
2 | // 2016-03-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||
6 | import java.util.ArrayList; | 6 | import java.util.ArrayList; |
7 | import java.util.HashMap; | 7 | import java.util.HashMap; |
8 | import java.util.Iterator; | ||
8 | import org.json.*; | 9 | import org.json.*; |
9 | import RT.*; | 10 | import RT.*; |
10 | 11 | ||
@@ -288,26 +289,138 @@ public class JSON { | |||
288 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) | 289 | , (V4<Float>)fromJSON(Type.V4_Float,obj.get("w")) |
289 | ); | 290 | ); |
290 | } | 291 | } |
291 | // case Array_Int: return ((JArray)obj).Select(x => fromJSON (Type.Int, x)).ToList(); | 292 | case Array_Int: { |
292 | // case Array_Int32: return ((JArray)obj).Select(x => fromJSON (Type.Int32, x)).ToList(); | 293 | JSONArray obj = (JSONArray)rawObj; |
293 | // case Array_Word32: return ((JArray)obj).Select(x => fromJSON (Type.Word32, x)).ToList(); | 294 | ArrayList<Integer> v = new ArrayList<Integer> (); |
294 | // case Array_Float: return ((JArray)obj).Select(x => fromJSON (Type.Float, x)).ToList(); | 295 | for (int i = 0; i < obj.length(); i++) { |
295 | // case Array_Bool: return ((JArray)obj).Select(x => fromJSON (Type.Bool, x)).ToList(); | 296 | v.add((Integer)fromJSON (Type.Int, obj.get(i))); |
296 | // case Array_ClearImage: return ((JArray)obj).Select(x => fromJSON (Type.ClearImage, x)).ToList(); | 297 | } |
297 | // case Array_Command: return ((JArray)obj).Select(x => fromJSON (Type.Command, x)).ToList(); | 298 | return v; |
298 | // case Array_Parameter: return ((JArray)obj).Select(x => fromJSON (Type.Parameter, x)).ToList(); | 299 | } |
299 | // case Array_Program: return ((JArray)obj).Select(x => fromJSON (Type.Program, x)).ToList(); | 300 | case Array_Int32: { |
300 | // case Array_RenderTarget: return ((JArray)obj).Select(x => fromJSON (Type.RenderTarget, x)).ToList(); | 301 | JSONArray obj = (JSONArray)rawObj; |
301 | // case Array_SamplerDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.SamplerDescriptor, x)).ToList(); | 302 | ArrayList<Integer> v = new ArrayList<Integer> (); |
302 | // case Array_Slot: return ((JArray)obj).Select(x => fromJSON (Type.Slot, x)).ToList(); | 303 | for (int i = 0; i < obj.length(); i++) { |
303 | // case Array_StreamData: return ((JArray)obj).Select(x => fromJSON (Type.StreamData, x)).ToList(); | 304 | v.add((Integer)fromJSON (Type.Int32, obj.get(i))); |
304 | // case Array_TargetItem: return ((JArray)obj).Select(x => fromJSON (Type.TargetItem, x)).ToList(); | 305 | } |
305 | // case Array_TextureDescriptor: return ((JArray)obj).Select(x => fromJSON (Type.TextureDescriptor, x)).ToList(); | 306 | return v; |
306 | // case List_FragmentOperation: return ((JArray)obj).Select(x => fromJSON (Type.FragmentOperation, x)).ToList(); | 307 | } |
307 | /* | 308 | case Array_Word32: { |
309 | JSONArray obj = (JSONArray)rawObj; | ||
310 | ArrayList<Integer> v = new ArrayList<Integer> (); | ||
311 | for (int i = 0; i < obj.length(); i++) { | ||
312 | v.add((Integer)fromJSON (Type.Word32, obj.get(i))); | ||
313 | } | ||
314 | return v; | ||
315 | } | ||
316 | case Array_Float: { | ||
317 | JSONArray obj = (JSONArray)rawObj; | ||
318 | ArrayList<Float> v = new ArrayList<Float> (); | ||
319 | for (int i = 0; i < obj.length(); i++) { | ||
320 | v.add((Float)fromJSON (Type.Float, obj.get(i))); | ||
321 | } | ||
322 | return v; | ||
323 | } | ||
324 | case Array_Bool: { | ||
325 | JSONArray obj = (JSONArray)rawObj; | ||
326 | ArrayList<Boolean> v = new ArrayList<Boolean> (); | ||
327 | for (int i = 0; i < obj.length(); i++) { | ||
328 | v.add((Boolean)fromJSON (Type.Bool, obj.get(i))); | ||
329 | } | ||
330 | return v; | ||
331 | } | ||
332 | case Array_ClearImage: { | ||
333 | JSONArray obj = (JSONArray)rawObj; | ||
334 | ArrayList<ClearImage> v = new ArrayList<ClearImage> (); | ||
335 | for (int i = 0; i < obj.length(); i++) { | ||
336 | v.add((ClearImage)fromJSON (Type.ClearImage, obj.get(i))); | ||
337 | } | ||
338 | return v; | ||
339 | } | ||
340 | case Array_Command: { | ||
341 | JSONArray obj = (JSONArray)rawObj; | ||
342 | ArrayList<Command> v = new ArrayList<Command> (); | ||
343 | for (int i = 0; i < obj.length(); i++) { | ||
344 | v.add((Command)fromJSON (Type.Command, obj.get(i))); | ||
345 | } | ||
346 | return v; | ||
347 | } | ||
348 | case Array_Parameter: { | ||
349 | JSONArray obj = (JSONArray)rawObj; | ||
350 | ArrayList<Parameter> v = new ArrayList<Parameter> (); | ||
351 | for (int i = 0; i < obj.length(); i++) { | ||
352 | v.add((Parameter)fromJSON (Type.Parameter, obj.get(i))); | ||
353 | } | ||
354 | return v; | ||
355 | } | ||
356 | case Array_Program: { | ||
357 | JSONArray obj = (JSONArray)rawObj; | ||
358 | ArrayList<Program> v = new ArrayList<Program> (); | ||
359 | for (int i = 0; i < obj.length(); i++) { | ||
360 | v.add((Program)fromJSON (Type.Program, obj.get(i))); | ||
361 | } | ||
362 | return v; | ||
363 | } | ||
364 | case Array_RenderTarget: { | ||
365 | JSONArray obj = (JSONArray)rawObj; | ||
366 | ArrayList<RenderTarget> v = new ArrayList<RenderTarget> (); | ||
367 | for (int i = 0; i < obj.length(); i++) { | ||
368 | v.add((RenderTarget)fromJSON (Type.RenderTarget, obj.get(i))); | ||
369 | } | ||
370 | return v; | ||
371 | } | ||
372 | case Array_SamplerDescriptor: { | ||
373 | JSONArray obj = (JSONArray)rawObj; | ||
374 | ArrayList<SamplerDescriptor> v = new ArrayList<SamplerDescriptor> (); | ||
375 | for (int i = 0; i < obj.length(); i++) { | ||
376 | v.add((SamplerDescriptor)fromJSON (Type.SamplerDescriptor, obj.get(i))); | ||
377 | } | ||
378 | return v; | ||
379 | } | ||
380 | case Array_Slot: { | ||
381 | JSONArray obj = (JSONArray)rawObj; | ||
382 | ArrayList<Slot> v = new ArrayList<Slot> (); | ||
383 | for (int i = 0; i < obj.length(); i++) { | ||
384 | v.add((Slot)fromJSON (Type.Slot, obj.get(i))); | ||
385 | } | ||
386 | return v; | ||
387 | } | ||
388 | case Array_StreamData: { | ||
389 | JSONArray obj = (JSONArray)rawObj; | ||
390 | ArrayList<StreamData> v = new ArrayList<StreamData> (); | ||
391 | for (int i = 0; i < obj.length(); i++) { | ||
392 | v.add((StreamData)fromJSON (Type.StreamData, obj.get(i))); | ||
393 | } | ||
394 | return v; | ||
395 | } | ||
396 | case Array_TargetItem: { | ||
397 | JSONArray obj = (JSONArray)rawObj; | ||
398 | ArrayList<TargetItem> v = new ArrayList<TargetItem> (); | ||
399 | for (int i = 0; i < obj.length(); i++) { | ||
400 | v.add((TargetItem)fromJSON (Type.TargetItem, obj.get(i))); | ||
401 | } | ||
402 | return v; | ||
403 | } | ||
404 | case Array_TextureDescriptor: { | ||
405 | JSONArray obj = (JSONArray)rawObj; | ||
406 | ArrayList<TextureDescriptor> v = new ArrayList<TextureDescriptor> (); | ||
407 | for (int i = 0; i < obj.length(); i++) { | ||
408 | v.add((TextureDescriptor)fromJSON (Type.TextureDescriptor, obj.get(i))); | ||
409 | } | ||
410 | return v; | ||
411 | } | ||
412 | case List_FragmentOperation: { | ||
413 | JSONArray obj = (JSONArray)rawObj; | ||
414 | ArrayList<FragmentOperation> v = new ArrayList<FragmentOperation> (); | ||
415 | for (int i = 0; i < obj.length(); i++) { | ||
416 | v.add((FragmentOperation)fromJSON (Type.FragmentOperation, obj.get(i))); | ||
417 | } | ||
418 | return v; | ||
419 | } | ||
308 | case Maybe_Int: { | 420 | case Maybe_Int: { |
309 | var m = new Maybe<Integer> (); | 421 | JSONObject obj = (JSONObject)rawObj; |
310 | if (obj == null || obj.Type == JTokenType.Null) { | 422 | Maybe<Integer> m = new Maybe<Integer> (); |
423 | if (obj == null || obj == JSONObject.NULL) { | ||
311 | m.valid = false; | 424 | m.valid = false; |
312 | } else { | 425 | } else { |
313 | m.valid = true; | 426 | m.valid = true; |
@@ -315,11 +428,10 @@ public class JSON { | |||
315 | } | 428 | } |
316 | return m; | 429 | return m; |
317 | } | 430 | } |
318 | */ | ||
319 | /* | ||
320 | case Maybe_Float: { | 431 | case Maybe_Float: { |
321 | var m = new Maybe<Float> (); | 432 | JSONObject obj = (JSONObject)rawObj; |
322 | if (obj == null || obj.Type == JTokenType.Null) { | 433 | Maybe<Float> m = new Maybe<Float> (); |
434 | if (obj == null || obj == JSONObject.NULL) { | ||
323 | m.valid = false; | 435 | m.valid = false; |
324 | } else { | 436 | } else { |
325 | m.valid = true; | 437 | m.valid = true; |
@@ -327,11 +439,10 @@ public class JSON { | |||
327 | } | 439 | } |
328 | return m; | 440 | return m; |
329 | } | 441 | } |
330 | */ | ||
331 | /* | ||
332 | case Maybe_String: { | 442 | case Maybe_String: { |
333 | var m = new Maybe<String> (); | 443 | JSONObject obj = (JSONObject)rawObj; |
334 | if (obj == null || obj.Type == JTokenType.Null) { | 444 | Maybe<String> m = new Maybe<String> (); |
445 | if (obj == null || obj == JSONObject.NULL) { | ||
335 | m.valid = false; | 446 | m.valid = false; |
336 | } else { | 447 | } else { |
337 | m.valid = true; | 448 | m.valid = true; |
@@ -339,11 +450,10 @@ public class JSON { | |||
339 | } | 450 | } |
340 | return m; | 451 | return m; |
341 | } | 452 | } |
342 | */ | ||
343 | /* | ||
344 | case Maybe_ComparisonFunction: { | 453 | case Maybe_ComparisonFunction: { |
345 | var m = new Maybe<ComparisonFunction> (); | 454 | JSONObject obj = (JSONObject)rawObj; |
346 | if (obj == null || obj.Type == JTokenType.Null) { | 455 | Maybe<ComparisonFunction> m = new Maybe<ComparisonFunction> (); |
456 | if (obj == null || obj == JSONObject.NULL) { | ||
347 | m.valid = false; | 457 | m.valid = false; |
348 | } else { | 458 | } else { |
349 | m.valid = true; | 459 | m.valid = true; |
@@ -351,11 +461,10 @@ public class JSON { | |||
351 | } | 461 | } |
352 | return m; | 462 | return m; |
353 | } | 463 | } |
354 | */ | ||
355 | /* | ||
356 | case Maybe_EdgeMode: { | 464 | case Maybe_EdgeMode: { |
357 | var m = new Maybe<EdgeMode> (); | 465 | JSONObject obj = (JSONObject)rawObj; |
358 | if (obj == null || obj.Type == JTokenType.Null) { | 466 | Maybe<EdgeMode> m = new Maybe<EdgeMode> (); |
467 | if (obj == null || obj == JSONObject.NULL) { | ||
359 | m.valid = false; | 468 | m.valid = false; |
360 | } else { | 469 | } else { |
361 | m.valid = true; | 470 | m.valid = true; |
@@ -363,11 +472,10 @@ public class JSON { | |||
363 | } | 472 | } |
364 | return m; | 473 | return m; |
365 | } | 474 | } |
366 | */ | ||
367 | /* | ||
368 | case Maybe_ImageRef: { | 475 | case Maybe_ImageRef: { |
369 | var m = new Maybe<ImageRef> (); | 476 | JSONObject obj = (JSONObject)rawObj; |
370 | if (obj == null || obj.Type == JTokenType.Null) { | 477 | Maybe<ImageRef> m = new Maybe<ImageRef> (); |
478 | if (obj == null || obj == JSONObject.NULL) { | ||
371 | m.valid = false; | 479 | m.valid = false; |
372 | } else { | 480 | } else { |
373 | m.valid = true; | 481 | m.valid = true; |
@@ -375,37 +483,36 @@ public class JSON { | |||
375 | } | 483 | } |
376 | return m; | 484 | return m; |
377 | } | 485 | } |
378 | */ | ||
379 | /* | ||
380 | case Map_String_ArrayValue: { | 486 | case Map_String_ArrayValue: { |
381 | var map = new HashMap<String, ArrayValue> (); | 487 | JSONObject obj = (JSONObject)rawObj; |
382 | foreach(var i in (JSONObject)rawObj) { | 488 | HashMap<String, ArrayValue> map = new HashMap<String, ArrayValue> (); |
383 | map.Add( (String)fromJSON(Type.String,i.Key) | 489 | Iterator<String> keyIt = obj.keys(); |
384 | , (ArrayValue)fromJSON(Type.ArrayValue,i.Value)); | 490 | while(keyIt.hasNext()) { |
491 | String key = keyIt.next(); | ||
492 | map.put(key, (ArrayValue)fromJSON(Type.ArrayValue,obj.get(key))); | ||
385 | } | 493 | } |
386 | return map; | 494 | return map; |
387 | } | 495 | } |
388 | */ | ||
389 | /* | ||
390 | case Map_String_InputType: { | 496 | case Map_String_InputType: { |
391 | var map = new HashMap<String, InputType> (); | 497 | JSONObject obj = (JSONObject)rawObj; |
392 | foreach(var i in (JSONObject)rawObj) { | 498 | HashMap<String, InputType> map = new HashMap<String, InputType> (); |
393 | map.Add( (String)fromJSON(Type.String,i.Key) | 499 | Iterator<String> keyIt = obj.keys(); |
394 | , (InputType)fromJSON(Type.InputType,i.Value)); | 500 | while(keyIt.hasNext()) { |
501 | String key = keyIt.next(); | ||
502 | map.put(key, (InputType)fromJSON(Type.InputType,obj.get(key))); | ||
395 | } | 503 | } |
396 | return map; | 504 | return map; |
397 | } | 505 | } |
398 | */ | ||
399 | /* | ||
400 | case Map_String_Parameter: { | 506 | case Map_String_Parameter: { |
401 | var map = new HashMap<String, Parameter> (); | 507 | JSONObject obj = (JSONObject)rawObj; |
402 | foreach(var i in (JSONObject)rawObj) { | 508 | HashMap<String, Parameter> map = new HashMap<String, Parameter> (); |
403 | map.Add( (String)fromJSON(Type.String,i.Key) | 509 | Iterator<String> keyIt = obj.keys(); |
404 | , (Parameter)fromJSON(Type.Parameter,i.Value)); | 510 | while(keyIt.hasNext()) { |
511 | String key = keyIt.next(); | ||
512 | map.put(key, (Parameter)fromJSON(Type.Parameter,obj.get(key))); | ||
405 | } | 513 | } |
406 | return map; | 514 | return map; |
407 | } | 515 | } |
408 | */ | ||
409 | 516 | ||
410 | case ArrayValue: { | 517 | case ArrayValue: { |
411 | JSONObject obj = (JSONObject)rawObj; | 518 | JSONObject obj = (JSONObject)rawObj; |
diff --git a/ddl/out/java/LambdaCube/IR/LogicOperation.java b/ddl/out/java/LambdaCube/IR/LogicOperation.java index 564f069..b7efcff 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 fdfa90b..068c824 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 80b9233..267ff8a 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 6eb1e8b..31b8701 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 020df55..b5c9a86 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 4f2981d..b1d4fe3 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 7145e2d..7c387b8 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 8e8bda0..decf1e5 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d5898ae..d25c57a 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 48f9e44..520ad58 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 44c33a2..ebe5f5f 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 bd1b381..dc3c725 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 3a430f5..ea18e10 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d531106..1fceace 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d5226fa..970c79e 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 3b2c9d7..9a4156d 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 6759674..5dff15d 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 275e52e..083c053 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 35304b5..7cf730c 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 8f48d54..6a2f49d 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 89705b5..392a38c 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 f4b2e15..2a7824d 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d8df081..23dedde 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 a17600a..bea424e 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
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 d4b809e..fe9d0cd 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-21T13:31:09.634879000000Z | 2 | // 2016-03-21T14:06:54.700322000000Z |
3 | 3 | ||
4 | package LambdaCube.IR; | 4 | package LambdaCube.IR; |
5 | 5 | ||