JSON parser checkpoint

lib/propane/generator.rb

@@ -191,7 +191,7 @@ class Propane
         end
         code = code.gsub(/\$(\d+)/) do |match|
           index = $1.to_i
-          "statevalues[$-1-n_states+#{index}].pvalue.v_#{rule.components[index - 1].ptypename}"
+          "statevalues[$-1-n_states+#{index}].pvalue.v_#{rule.ptypename}"
         end
       else
         code = code.gsub(/\$\$/) do |match|

spec/json_types.d

@@ -2,45 +2,22 @@ class JSONValue
 {
 }
 
-class JSONObject : JSONValue
+class JSONObject < JSONValue
 {
     JSONValue[string] value;
-
-    this()
-    {
-    }
-
-    this(JSONValue[string] value)
-    {
-        this.value = value;
-    }
 }
 
-class JSONArray : JSONValue
+class JSONArray < JSONValue
 {
     JSONValue[] value;
-
-    this()
-    {
-    }
-
-    this(JSONValue[] value)
-    {
-        this.value = value;
-    }
 }
 
-class JSONNumber : JSONValue
+class JSONNumber < JSONValue
 {
     double value;
-
-    this(double value)
-    {
-        this.value = value;
-    }
 }
 
-class JSONString : JSONValue
+class JSONString < JSONValue
 {
     string value;
 
@@ -50,14 +27,14 @@ class JSONString : JSONValue
     }
 }
 
-class JSONTrue : JSONValue
+class JSONTrue < JSONValue
 {
 }
 
-class JSONFalse : JSONValue
+class JSONFalse < JSONValue
 {
 }
 
-class JSONNull : JSONValue
+class JSONNull < JSONValue
 {
 }

spec/propane_spec.rb

@@ -19,8 +19,8 @@ describe Propane do
     end
   end
 
-  def compile(*test_files)
-    result = system(*%w[gdc -funittest -o spec/run/testparser spec/run/testparser.d -Ispec], *test_files)
+  def compile(test_file)
+    result = system(*%w[gdc -funittest -o spec/run/testparser spec/run/testparser.d], test_file)
     expect(result).to be_truthy
   end
 
@@ -341,15 +341,9 @@ EOF
   import json_types;
   string string_value;
 >>
-
-ptype JSONValue;
-ptype array = JSONValue[];
-ptype dict = JSONValue[string];
-ptype string = string;
-
 drop /\\s+/;
 token lbrace /\\{/;
-token rbrace /\\}/;
+token rbrace /\\}/RuRfaw2CHgpvCWu;
 token lbracket /\\[/;
 token rbracket /\\]/;
 token comma /,/;
@@ -366,8 +360,7 @@ token number /-?(0|[1-9][0-9]*)(\\.[0-9]+)?([eE][-+]?[0-9]+)?/ <<
       negative = true;
     }
   }
-  double n = 1.0;
-  $$ = new JSONNumber(n);
+  $$ = new JSONNumber();
 >>
 token true <<
   $$ = new JSONTrue();
@@ -382,8 +375,8 @@ token null <<
   $mode(string);
   string_value = "";
 >>
-string: token string (string) /"/ <<
-  $$ = string_value;
+string: token string /"/ <<
+  $$ = new JSONString(string_value);
   $mode(default);
 >>
 string: /\\\\"/ <<
@@ -421,7 +414,7 @@ Start -> Value <<
   $$ = $1;
 >>
 Value -> string <<
-  $$ = new JSONString($1);
+  $$ = $1;
 >>
 Value -> number <<
   $$ = $1;
@@ -447,7 +440,7 @@ Object -> lbrace rbrace <<
 Object -> lbrace KeyValues rbrace <<
   $$ = new JSONObject($2);
 >>
-KeyValues (dict) -> KeyValue <<
+KeyValues -> KeyValue <<
   $$ = $1;
 >>
 KeyValues -> KeyValues comma KeyValue <<
@@ -457,23 +450,15 @@ KeyValues -> KeyValues comma KeyValue <<
   }
   $$ = $1;
 >>
-KeyValue (dict) -> string colon Value <<
-  $$ = [$1: $3];
->>
-Array -> lbracket rbracket <<
-  $$ = new JSONArray();
->>
-Array -> lbracket Values rbracket <<
-  $$ = new JSONArray($2);
->>
-Values (array) -> Value <<
-  $$ = [$1];
->>
-Values -> Values comma Value <<
-  $$ = $1 ~ [$3];
+KeyValue -> string colon Value <<
+  $$ = 
 >>
+Array -> lbracket rbracket;
+Array -> lbracket Values rbracket;
+Values -> Value;
+Values -> Values comma Value;
 EOF
     build_parser
-    compile("spec/test_parsing_json.d", "spec/json_types.d")
+    compile("spec/test_parsing_json.d")
   end
 end