modl 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d523ed6cc09d2f413a4f0df27405a219d107c5f5219e2a8fcb2acb78f3f42370
-  data.tar.gz: 0cb8e6e85ca9d0421f87ca0a77532fe1a1c740864007136826b60eacab73f9ec
+  metadata.gz: 0caf497c5981059ad90756e23646d96305d942e8156c65c38c4bb5afc9c062dd
+  data.tar.gz: 10025546c2ff729584277b5bfbe6c0da573dbd3619878224349095ac5397c69f
 SHA512:
-  metadata.gz: d3aa20fafe4caddf80691a676ff0e3e60c6a12b75a0831594d2dd676f31a9198926b4deef043502d9855bb247673368df449b74793db279afd9f162e4e88e030
-  data.tar.gz: 61414bce44abce673ce36303aa53aa981cf8445fd22d43a7843dc8d6fa906f4a466da3726bb883a730ead90daeb773df0a17eafd486dfd024a0ee1963344b2bd
+  metadata.gz: 25913fd65a62f4d5ad0cadc7368a9443e79b542568deabb8286e4ae9617e57e944a819c4803d0fd45c1bbdce89a62d4ac2dace2e9620ce39c8d89824116951d4
+  data.tar.gz: 7b9a44c8e7babe192a884a8df6b5c07c9cec48cb73194c3c86bead81082916e3ab11d73324a9152b15c0e39bc57b23008ed82247fa25175c11c69456fa71c099

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+0.3.6
+===
+- Use latest ANTLR4 Ruby.stg updated by Cameron Dutro.
+- Use antrl4-runtime v0.2.2 which fixes some issues around Array2DHashSet
+- Fixed a failing error test due to incorrect value type for a `*class` with supertype `num`.
+- Corrected the ordering of fields within a class.
+- Return `null` for empty output rather than `""`
+- Fixed GitHub issue#4 - improved error reporting.
+
 0.3.5
 ===
 - Fixed another bug with class handling to expand classes properly.

data/grammar_tests/base_tests.json

@@ -590,7 +590,7 @@
 }, {
   "input": "_L=en;\n{\n C=ca?\n    o(\n      n=Tesco Canada;\n      s={L=fr?\n        Chaque Petite Contribution\n      /?\n        Every Little Helps\n      }\n    )\n}",
   "minimised_modl": "_L=en;{C=ca?o(n=Tesco Canada;s={L=fr?Chaque Petite Contribution/?Every Little Helps})}",
-  "expected_output": "\n"
+  "expected_output": "null"
 }, {
   "input": "_letter=a;\n{\n letter=a?\n   word=Apple\n /letter=b?\n   word=Bee\n /?\n   word=Other\n}",
   "minimised_modl": "_letter=a;{letter=a?word=Apple/letter=b?word=Bee/?word=Other}",
@@ -634,7 +634,7 @@
 }, {
   "input": "_test = 123;\n_test2 = abc",
   "minimised_modl": "_test=123;_test2=abc",
-  "expected_output": "\n"
+  "expected_output": "null"
 }, {
   "input": "_co=gb;\ntest=123",
   "minimised_modl": "_co=gb;test=123",
@@ -698,7 +698,7 @@
 }, {
   "input": "_T=grammar_tests/demo;\n*L=`%T`_config",
   "minimised_modl": "_T=grammar_tests/demo;*L=`%T`_config",
-  "expected_output": "\n"
+  "expected_output": "null"
 }, {
   "input": "*l=grammar_tests/1;*L=grammar_tests/1;a=1",
   "minimised_modl": "*l=grammar_tests/1;*L=grammar_tests/1;a=1",
@@ -995,5 +995,5 @@
     "expected_output": "{\"x\" : [ 1, null, null, null, null, null, null, [2, null, null, null, null, null, null, null, null, 3], null, null, null, null, null, null, null, null, null, [4, null, null, null, null, null, null, null, null, 5] ]}"},
   {"input": "*LOAD=\"http://modules.num.uk/1.txt\";o=Tesco:Every Little Helps:[t=Customer Service:0845555555];",
     "minimised_modl": "*LOAD=\"http://modules.num.uk/1.txt\";o=Tesco:Every Little Helps:[t=Customer Service:0845555555];",
-    "expected_output": "{\n  \"organisation\": {\n    \"object_type\": \"entity\",\n    \"object_display_name\": \"Organisation\",\n    \"description_default\": \"View Organisation\",\n    \"name\": \"Tesco\",\n    \"slogan\": \"Every Little Helps\",\n    \"objects\": [\n      {\n        \"telephone\": {\n          \"object_type\": \"media\",\n          \"object_display_name\": \"Telephone\",\n          \"description_default\": \"Call\",\n          \"prefix\": \"tel://\",\n          \"media_type\": \"core\",\n          \"description\": \"Customer Service\",\n          \"value\": \"0845555555\"\n        }\n      }\n    ]\n  }\n}\n"}
+    "expected_output": "{\"organisation\":{\"name\":\"Tesco\",\"slogan\":\"Every Little Helps\",\"objects\":[{\"telephone\":{\"description\":\"Customer Service\",\"value\":\"0845555555\",\"object_type\":\"media\",\"object_display_name\":\"Telephone\",\"description_default\":\"Call\",\"prefix\":\"tel://\",\"media_type\":\"core\"}}],\"object_type\":\"entity\",\"object_display_name\":\"Organisation\",\"description_default\":\"View Organisation\"}}"}
 ]

data/lib/modl/parser/MODLParser.rb

@@ -128,9 +128,9 @@ class MODLParser < Antlr4::Runtime::Parser
 	end
 
 	 class ModlContext < Antlr4::Runtime::ParserRuleContext
-     def EOF()
-       return token(MODLParser::EOF, 0)
-     end
+		 def EOF()
+			 return token(MODLParser::EOF, 0)
+		 end
 		def modl_structure()
 			return rule_contexts("Modl_structureContext")
 		end
@@ -150,18 +150,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl))
 			  listener.enterModl(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl))
 			  listener.exitModl(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl))
 			  return visitor.visitModl(self)
 			else
 			 return visitor.visit_children(self)
@@ -175,9 +175,9 @@ class MODLParser < Antlr4::Runtime::Parser
 		_la = 0
 		begin
 			_alt = 0
-      enter_outer_alt(_localctx, 1)
+			enter_outer_alt(_localctx, 1)
 
-      @_state_number = 62
+			@_state_number = 62
 			@_err_handler.sync(self)
 			case ( @_interp.adaptive_predict(@_input,3,@_ctx) )
 			when 1
@@ -224,9 +224,9 @@ class MODLParser < Antlr4::Runtime::Parser
 				end
 
 
-      end
-      @_state_number = 64
-      match(EOF)
+			end
+			@_state_number = 64
+			match(EOF)
 		rescue Antlr4::Runtime::RecognitionException => re
 			_localctx.exception = re
 			@_err_handler.report_error(self, re)
@@ -257,18 +257,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_structure
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_structure))
 			  listener.enterModl_structure(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_structure))
 			  listener.exitModl_structure(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_structure))
 			  return visitor.visitModl_structure(self)
 			else
 			 return visitor.visit_children(self)
@@ -345,18 +345,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_map
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_map))
 			  listener.enterModl_map(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_map))
 			  listener.exitModl_map(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_map))
 			  return visitor.visitModl_map(self)
 			else
 			 return visitor.visit_children(self)
@@ -440,18 +440,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_array
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_array))
 			  listener.enterModl_array(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_array))
 			  listener.exitModl_array(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_array))
 			  return visitor.visitModl_array(self)
 			else
 			 return visitor.visit_children(self)
@@ -573,18 +573,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_nb_array
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_nb_array))
 			  listener.enterModl_nb_array(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_nb_array))
 			  listener.exitModl_nb_array(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_nb_array))
 			  return visitor.visitModl_nb_array(self)
 			else
 			 return visitor.visit_children(self)
@@ -708,18 +708,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_pair
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_pair))
 			  listener.enterModl_pair(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_pair))
 			  listener.exitModl_pair(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_pair))
 			  return visitor.visitModl_pair(self)
 			else
 			 return visitor.visit_children(self)
@@ -796,18 +796,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_value_item
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_value_item))
 			  listener.enterModl_value_item(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_value_item))
 			  listener.exitModl_value_item(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_value_item))
 			  return visitor.visitModl_value_item(self)
 			else
 			 return visitor.visit_children(self)
@@ -883,18 +883,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_top_level_conditional
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_top_level_conditional))
 			  listener.enterModl_top_level_conditional(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_top_level_conditional))
 			  listener.exitModl_top_level_conditional(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_top_level_conditional))
 			  return visitor.visitModl_top_level_conditional(self)
 			else
 			 return visitor.visit_children(self)
@@ -968,18 +968,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_top_level_conditional_return
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_top_level_conditional_return))
 			  listener.enterModl_top_level_conditional_return(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_top_level_conditional_return))
 			  listener.exitModl_top_level_conditional_return(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_top_level_conditional_return))
 			  return visitor.visitModl_top_level_conditional_return(self)
 			else
 			 return visitor.visit_children(self)
@@ -1054,18 +1054,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_map_conditional
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_map_conditional))
 			  listener.enterModl_map_conditional(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_map_conditional))
 			  listener.exitModl_map_conditional(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_map_conditional))
 			  return visitor.visitModl_map_conditional(self)
 			else
 			 return visitor.visit_children(self)
@@ -1139,18 +1139,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_map_conditional_return
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_map_conditional_return))
 			  listener.enterModl_map_conditional_return(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_map_conditional_return))
 			  listener.exitModl_map_conditional_return(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_map_conditional_return))
 			  return visitor.visitModl_map_conditional_return(self)
 			else
 			 return visitor.visit_children(self)
@@ -1202,18 +1202,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_map_item
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_map_item))
 			  listener.enterModl_map_item(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_map_item))
 			  listener.exitModl_map_item(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_map_item))
 			  return visitor.visitModl_map_item(self)
 			else
 			 return visitor.visit_children(self)
@@ -1290,18 +1290,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_array_conditional
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_array_conditional))
 			  listener.enterModl_array_conditional(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_array_conditional))
 			  listener.exitModl_array_conditional(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_array_conditional))
 			  return visitor.visitModl_array_conditional(self)
 			else
 			 return visitor.visit_children(self)
@@ -1375,18 +1375,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_array_conditional_return
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_array_conditional_return))
 			  listener.enterModl_array_conditional_return(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_array_conditional_return))
 			  listener.exitModl_array_conditional_return(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_array_conditional_return))
 			  return visitor.visitModl_array_conditional_return(self)
 			else
 			 return visitor.visit_children(self)
@@ -1438,18 +1438,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_array_item
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_array_item))
 			  listener.enterModl_array_item(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_array_item))
 			  listener.exitModl_array_item(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_array_item))
 			  return visitor.visitModl_array_item(self)
 			else
 			 return visitor.visit_children(self)
@@ -1526,18 +1526,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_value_conditional
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_value_conditional))
 			  listener.enterModl_value_conditional(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_value_conditional))
 			  listener.exitModl_value_conditional(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_value_conditional))
 			  return visitor.visitModl_value_conditional(self)
 			else
 			 return visitor.visit_children(self)
@@ -1627,18 +1627,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_value_conditional_return
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_value_conditional_return))
 			  listener.enterModl_value_conditional_return(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_value_conditional_return))
 			  listener.exitModl_value_conditional_return(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_value_conditional_return))
 			  return visitor.visitModl_value_conditional_return(self)
 			else
 			 return visitor.visit_children(self)
@@ -1717,18 +1717,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_condition_test
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_condition_test))
 			  listener.enterModl_condition_test(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_condition_test))
 			  listener.exitModl_condition_test(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_condition_test))
 			  return visitor.visitModl_condition_test(self)
 			else
 			 return visitor.visit_children(self)
@@ -1844,18 +1844,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_operator
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_operator))
 			  listener.enterModl_operator(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_operator))
 			  listener.exitModl_operator(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_operator))
 			  return visitor.visitModl_operator(self)
 			else
 			 return visitor.visit_children(self)
@@ -1949,18 +1949,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_condition
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_condition))
 			  listener.enterModl_condition(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_condition))
 			  listener.exitModl_condition(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_condition))
 			  return visitor.visitModl_condition(self)
 			else
 			 return visitor.visit_children(self)
@@ -2051,18 +2051,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_condition_group
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_condition_group))
 			  listener.enterModl_condition_group(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_condition_group))
 			  listener.exitModl_condition_group(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_condition_group))
 			  return visitor.visitModl_condition_group(self)
 			else
 			 return visitor.visit_children(self)
@@ -2140,18 +2140,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_value
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_value))
 			  listener.enterModl_value(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_value))
 			  listener.exitModl_value(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_value))
 			  return visitor.visitModl_value(self)
 			else
 			 return visitor.visit_children(self)
@@ -2227,18 +2227,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_array_value_item
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_array_value_item))
 			  listener.enterModl_array_value_item(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_array_value_item))
 			  listener.exitModl_array_value_item(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_array_value_item))
 			  return visitor.visitModl_array_value_item(self)
 			else
 			 return visitor.visit_children(self)
@@ -2314,18 +2314,18 @@ class MODLParser < Antlr4::Runtime::Parser
 		 return RULE_modl_primitive
 		end
 		def enter_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:enterModl_primitive))
 			  listener.enterModl_primitive(self)
 			end
 		end
 		def exit_rule( listener)
-			if ( listener.is_a? MODLParserListener )
+			if (listener.respond_to?(:exitModl_primitive))
 			  listener.exitModl_primitive(self)
 			end
 		end
 
 		def accept(visitor)
-			if ( visitor.is_a? MODLParserVisitor )
+			if (visitor.respond_to?(:visitModl_primitive))
 			  return visitor.visitModl_primitive(self)
 			else
 			 return visitor.visit_children(self)
@@ -2363,128 +2363,128 @@ class MODLParser < Antlr4::Runtime::Parser
 	end
 
 	@@_serializedATN = ["\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964",
-                      "\3 \u0145\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4",
-                      "\t\t\t\4\n\t\n\4\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t",
-                      "\20\4\21\t\21\4\22\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27",
-                      "\t\27\4\30\t\30\4\31\t\31\3\2\5\2\64\n\2\3\2\3\2\3\2\7\29\n\2\f\2\16",
-                      "\2<\13\2\3\2\5\2?\n\2\5\2A\n\2\3\2\3\2\3\3\3\3\3\3\3\3\5\3I\n\3\3\4",
-                      "\3\4\3\4\3\4\7\4O\n\4\f\4\16\4R\13\4\5\4T\n\4\3\4\3\4\3\5\3\5\3\5\5",
-                      "\5[\n\5\3\5\6\5^\n\5\r\5\16\5_\3\5\3\5\5\5d\n\5\3\5\7\5g\n\5\f\5\16",
-                      "\5j\13\5\7\5l\n\5\f\5\16\5o\13\5\5\5q\n\5\3\5\3\5\3\6\3\6\6\6w\n\6",
-                      "\r\6\16\6x\6\6{\n\6\r\6\16\6|\3\6\7\6\u0080\n\6\f\6\16\6\u0083\13\6",
-                      "\3\6\5\6\u0086\n\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\5\7\u008f\n\7\3\b\3",
-                      "\b\5\b\u0093\n\b\3\t\3\t\3\t\3\t\3\t\3\t\5\t\u009b\n\t\3\t\3\t\7\t",
-                      "\u009f\n\t\f\t\16\t\u00a2\13\t\3\t\3\t\3\n\7\n\u00a7\n\n\f\n\16\n\u00aa",
-                      "\13\n\3\13\3\13\3\13\3\13\3\13\3\13\5\13\u00b2\n\13\3\13\3\13\7\13",
-                      "\u00b6\n\13\f\13\16\13\u00b9\13\13\3\13\3\13\3\f\6\f\u00be\n\f\r\f",
-                      "\16\f\u00bf\3\r\3\r\5\r\u00c4\n\r\3\16\3\16\3\16\3\16\3\16\3\16\5\16",
-                      "\u00cc\n\16\3\16\3\16\7\16\u00d0\n\16\f\16\16\16\u00d3\13\16\3\16\3",
-                      "\16\3\17\6\17\u00d8\n\17\r\17\16\17\u00d9\3\20\3\20\5\20\u00de\n\20",
-                      "\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00e9\n\21\f\21",
-                      "\16\21\u00ec\13\21\3\21\3\21\3\21\3\21\5\21\u00f2\n\21\3\21\3\21\3",
-                      "\22\3\22\3\22\7\22\u00f9\n\22\f\22\16\22\u00fc\13\22\3\23\5\23\u00ff",
-                      "\n\23\3\23\3\23\5\23\u0103\n\23\3\23\3\23\5\23\u0107\n\23\3\23\3\23",
-                      "\5\23\u010b\n\23\7\23\u010d\n\23\f\23\16\23\u0110\13\23\3\24\3\24\3",
-                      "\24\3\24\3\24\3\24\3\24\3\24\3\24\5\24\u011b\n\24\3\25\5\25\u011e\n",
-                      "\25\3\25\5\25\u0121\n\25\3\25\3\25\3\25\7\25\u0126\n\25\f\25\16\25",
-                      "\u0129\13\25\3\26\3\26\3\26\3\26\7\26\u012f\n\26\f\26\16\26\u0132\13",
-                      "\26\3\26\3\26\3\27\3\27\3\27\3\27\3\27\5\27\u013b\n\27\3\30\3\30\3",
-                      "\30\3\30\5\30\u0141\n\30\3\31\3\31\3\31\2\2\32\2\4\6\b\n\f\16\20\22",
-                      "\24\26\30\32\34\36 \"$&(*,.\60\2\4\6\2\4\6\17\17\21\21\23\23\3\2\34",
-                      "\35\2\u0165\2@\3\2\2\2\4H\3\2\2\2\6J\3\2\2\2\bW\3\2\2\2\nz\3\2\2\2",
-                      "\f\u008e\3\2\2\2\16\u0092\3\2\2\2\20\u0094\3\2\2\2\22\u00a8\3\2\2\2",
-                      "\24\u00ab\3\2\2\2\26\u00bd\3\2\2\2\30\u00c3\3\2\2\2\32\u00c5\3\2\2",
-                      "\2\34\u00d7\3\2\2\2\36\u00dd\3\2\2\2 \u00df\3\2\2\2\"\u00f5\3\2\2\2",
-                      "$\u00fe\3\2\2\2&\u011a\3\2\2\2(\u011d\3\2\2\2*\u012a\3\2\2\2,\u013a",
-                      "\3\2\2\2.\u0140\3\2\2\2\60\u0142\3\2\2\2\62\64\5\4\3\2\63\62\3\2\2",
-                      "\2\63\64\3\2\2\2\64A\3\2\2\2\65:\5\4\3\2\66\67\7\t\2\2\679\5\4\3\2",
-                      "8\66\3\2\2\29<\3\2\2\2:8\3\2\2\2:;\3\2\2\2;>\3\2\2\2<:\3\2\2\2=?\7",
-                      "\t\2\2>=\3\2\2\2>?\3\2\2\2?A\3\2\2\2@\63\3\2\2\2@\65\3\2\2\2AB\3\2",
-                      "\2\2BC\7\2\2\3C\3\3\2\2\2DI\5\6\4\2EI\5\b\5\2FI\5\20\t\2GI\5\f\7\2",
-                      "HD\3\2\2\2HE\3\2\2\2HF\3\2\2\2HG\3\2\2\2I\5\3\2\2\2JS\7\13\2\2KP\5",
-                      "\30\r\2LM\7\t\2\2MO\5\30\r\2NL\3\2\2\2OR\3\2\2\2PN\3\2\2\2PQ\3\2\2",
-                      "\2QT\3\2\2\2RP\3\2\2\2SK\3\2\2\2ST\3\2\2\2TU\3\2\2\2UV\7\f\2\2V\7\3",
-                      "\2\2\2Wp\7\r\2\2X[\5\36\20\2Y[\5\n\6\2ZX\3\2\2\2ZY\3\2\2\2[m\3\2\2",
-                      "\2\\^\7\t\2\2]\\\3\2\2\2^_\3\2\2\2_]\3\2\2\2_`\3\2\2\2`c\3\2\2\2ad",
-                      "\5\36\20\2bd\5\n\6\2ca\3\2\2\2cb\3\2\2\2dh\3\2\2\2eg\7\t\2\2fe\3\2",
-                      "\2\2gj\3\2\2\2hf\3\2\2\2hi\3\2\2\2il\3\2\2\2jh\3\2\2\2k]\3\2\2\2lo",
-                      "\3\2\2\2mk\3\2\2\2mn\3\2\2\2nq\3\2\2\2om\3\2\2\2pZ\3\2\2\2pq\3\2\2",
-                      "\2qr\3\2\2\2rs\7\16\2\2s\t\3\2\2\2tv\5\36\20\2uw\7\7\2\2vu\3\2\2\2",
-                      "wx\3\2\2\2xv\3\2\2\2xy\3\2\2\2y{\3\2\2\2zt\3\2\2\2{|\3\2\2\2|z\3\2",
-                      "\2\2|}\3\2\2\2}\u0081\3\2\2\2~\u0080\5\36\20\2\177~\3\2\2\2\u0080\u0083",
-                      "\3\2\2\2\u0081\177\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0085\3\2\2\2",
-                      "\u0083\u0081\3\2\2\2\u0084\u0086\7\7\2\2\u0085\u0084\3\2\2\2\u0085",
-                      "\u0086\3\2\2\2\u0086\13\3\2\2\2\u0087\u0088\t\2\2\2\u0088\u0089\7\b",
-                      "\2\2\u0089\u008f\5\16\b\2\u008a\u008b\7\21\2\2\u008b\u008f\5\6\4\2",
-                      "\u008c\u008d\7\21\2\2\u008d\u008f\5\b\5\2\u008e\u0087\3\2\2\2\u008e",
-                      "\u008a\3\2\2\2\u008e\u008c\3\2\2\2\u008f\r\3\2\2\2\u0090\u0093\5,\27",
-                      "\2\u0091\u0093\5 \21\2\u0092\u0090\3\2\2\2\u0092\u0091\3\2\2\2\u0093",
-                      "\17\3\2\2\2\u0094\u0095\7\25\2\2\u0095\u0096\5$\23\2\u0096\u0097\7",
-                      "\27\2\2\u0097\u00a0\5\22\n\2\u0098\u009a\7\30\2\2\u0099\u009b\5$\23",
-                      "\2\u009a\u0099\3\2\2\2\u009a\u009b\3\2\2\2\u009b\u009c\3\2\2\2\u009c",
-                      "\u009d\7\27\2\2\u009d\u009f\5\22\n\2\u009e\u0098\3\2\2\2\u009f\u00a2",
-                      "\3\2\2\2\u00a0\u009e\3\2\2\2\u00a0\u00a1\3\2\2\2\u00a1\u00a3\3\2\2",
-                      "\2\u00a2\u00a0\3\2\2\2\u00a3\u00a4\7 \2\2\u00a4\21\3\2\2\2\u00a5\u00a7",
-                      "\5\4\3\2\u00a6\u00a5\3\2\2\2\u00a7\u00aa\3\2\2\2\u00a8\u00a6\3\2\2",
-                      "\2\u00a8\u00a9\3\2\2\2\u00a9\23\3\2\2\2\u00aa\u00a8\3\2\2\2\u00ab\u00ac",
-                      "\7\25\2\2\u00ac\u00ad\5$\23\2\u00ad\u00ae\7\27\2\2\u00ae\u00b7\5\26",
-                      "\f\2\u00af\u00b1\7\30\2\2\u00b0\u00b2\5$\23\2\u00b1\u00b0\3\2\2\2\u00b1",
-                      "\u00b2\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00b4\7\27\2\2\u00b4\u00b6",
-                      "\5\26\f\2\u00b5\u00af\3\2\2\2\u00b6\u00b9\3\2\2\2\u00b7\u00b5\3\2\2",
-                      "\2\u00b7\u00b8\3\2\2\2\u00b8\u00ba\3\2\2\2\u00b9\u00b7\3\2\2\2\u00ba",
-                      "\u00bb\7 \2\2\u00bb\25\3\2\2\2\u00bc\u00be\5\30\r\2\u00bd\u00bc\3\2",
-                      "\2\2\u00be\u00bf\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00c0\3\2\2\2\u00c0",
-                      "\27\3\2\2\2\u00c1\u00c4\5\f\7\2\u00c2\u00c4\5\24\13\2\u00c3\u00c1\3",
-                      "\2\2\2\u00c3\u00c2\3\2\2\2\u00c4\31\3\2\2\2\u00c5\u00c6\7\25\2\2\u00c6",
-                      "\u00c7\5$\23\2\u00c7\u00c8\7\27\2\2\u00c8\u00d1\5\34\17\2\u00c9\u00cb",
-                      "\7\30\2\2\u00ca\u00cc\5$\23\2\u00cb\u00ca\3\2\2\2\u00cb\u00cc\3\2\2",
-                      "\2\u00cc\u00cd\3\2\2\2\u00cd\u00ce\7\27\2\2\u00ce\u00d0\5\34\17\2\u00cf",
-                      "\u00c9\3\2\2\2\u00d0\u00d3\3\2\2\2\u00d1\u00cf\3\2\2\2\u00d1\u00d2",
-                      "\3\2\2\2\u00d2\u00d4\3\2\2\2\u00d3\u00d1\3\2\2\2\u00d4\u00d5\7 \2\2",
-                      "\u00d5\33\3\2\2\2\u00d6\u00d8\5\36\20\2\u00d7\u00d6\3\2\2\2\u00d8\u00d9",
-                      "\3\2\2\2\u00d9\u00d7\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\35\3\2\2\2\u00db",
-                      "\u00de\5.\30\2\u00dc\u00de\5\32\16\2\u00dd\u00db\3\2\2\2\u00dd\u00dc",
-                      "\3\2\2\2\u00de\37\3\2\2\2\u00df\u00e0\7\25\2\2\u00e0\u00e1\5$\23\2",
-                      "\u00e1\u00f1\7\27\2\2\u00e2\u00ea\5\"\22\2\u00e3\u00e4\7\30\2\2\u00e4",
-                      "\u00e5\5$\23\2\u00e5\u00e6\7\27\2\2\u00e6\u00e7\5\"\22\2\u00e7\u00e9",
-                      "\3\2\2\2\u00e8\u00e3\3\2\2\2\u00e9\u00ec\3\2\2\2\u00ea\u00e8\3\2\2",
-                      "\2\u00ea\u00eb\3\2\2\2\u00eb\u00ed\3\2\2\2\u00ec\u00ea\3\2\2\2\u00ed",
-                      "\u00ee\7\30\2\2\u00ee\u00ef\7\27\2\2\u00ef\u00f0\5\"\22\2\u00f0\u00f2",
-                      "\3\2\2\2\u00f1\u00e2\3\2\2\2\u00f1\u00f2\3\2\2\2\u00f2\u00f3\3\2\2",
-                      "\2\u00f3\u00f4\7 \2\2\u00f4!\3\2\2\2\u00f5\u00fa\5\16\b\2\u00f6\u00f7",
-                      "\7\7\2\2\u00f7\u00f9\5\16\b\2\u00f8\u00f6\3\2\2\2\u00f9\u00fc\3\2\2",
-                      "\2\u00fa\u00f8\3\2\2\2\u00fa\u00fb\3\2\2\2\u00fb#\3\2\2\2\u00fc\u00fa",
-                      "\3\2\2\2\u00fd\u00ff\7\36\2\2\u00fe\u00fd\3\2\2\2\u00fe\u00ff\3\2\2",
-                      "\2\u00ff\u0102\3\2\2\2\u0100\u0103\5(\25\2\u0101\u0103\5*\26\2\u0102",
-                      "\u0100\3\2\2\2\u0102\u0101\3\2\2\2\u0103\u010e\3\2\2\2\u0104\u0106",
-                      "\t\3\2\2\u0105\u0107\7\36\2\2\u0106\u0105\3\2\2\2\u0106\u0107\3\2\2",
-                      "\2\u0107\u010a\3\2\2\2\u0108\u010b\5(\25\2\u0109\u010b\5*\26\2\u010a",
-                      "\u0108\3\2\2\2\u010a\u0109\3\2\2\2\u010b\u010d\3\2\2\2\u010c\u0104",
-                      "\3\2\2\2\u010d\u0110\3\2\2\2\u010e\u010c\3\2\2\2\u010e\u010f\3\2\2",
-                      "\2\u010f%\3\2\2\2\u0110\u010e\3\2\2\2\u0111\u011b\7\b\2\2\u0112\u011b",
-                      "\7\31\2\2\u0113\u0114\7\31\2\2\u0114\u011b\7\b\2\2\u0115\u011b\7\32",
-                      "\2\2\u0116\u0117\7\32\2\2\u0117\u011b\7\b\2\2\u0118\u0119\7\36\2\2",
-                      "\u0119\u011b\7\b\2\2\u011a\u0111\3\2\2\2\u011a\u0112\3\2\2\2\u011a",
-                      "\u0113\3\2\2\2\u011a\u0115\3\2\2\2\u011a\u0116\3\2\2\2\u011a\u0118",
-                      "\3\2\2\2\u011b\'\3\2\2\2\u011c\u011e\7\21\2\2\u011d\u011c\3\2\2\2\u011d",
-                      "\u011e\3\2\2\2\u011e\u0120\3\2\2\2\u011f\u0121\5&\24\2\u0120\u011f",
-                      "\3\2\2\2\u0120\u0121\3\2\2\2\u0121\u0122\3\2\2\2\u0122\u0127\5,\27",
-                      "\2\u0123\u0124\7\30\2\2\u0124\u0126\5,\27\2\u0125\u0123\3\2\2\2\u0126",
-                      "\u0129\3\2\2\2\u0127\u0125\3\2\2\2\u0127\u0128\3\2\2\2\u0128)\3\2\2",
-                      "\2\u0129\u0127\3\2\2\2\u012a\u012b\7\25\2\2\u012b\u0130\5$\23\2\u012c",
-                      "\u012d\t\3\2\2\u012d\u012f\5$\23\2\u012e\u012c\3\2\2\2\u012f\u0132",
-                      "\3\2\2\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131\u0133\3\2\2",
-                      "\2\u0132\u0130\3\2\2\2\u0133\u0134\7 \2\2\u0134+\3\2\2\2\u0135\u013b",
-                      "\5\6\4\2\u0136\u013b\5\b\5\2\u0137\u013b\5\n\6\2\u0138\u013b\5\f\7",
-                      "\2\u0139\u013b\5\60\31\2\u013a\u0135\3\2\2\2\u013a\u0136\3\2\2\2\u013a",
-                      "\u0137\3\2\2\2\u013a\u0138\3\2\2\2\u013a\u0139\3\2\2\2\u013b-\3\2\2",
-                      "\2\u013c\u0141\5\6\4\2\u013d\u0141\5\f\7\2\u013e\u0141\5\b\5\2\u013f",
-                      "\u0141\5\60\31\2\u0140\u013c\3\2\2\2\u0140\u013d\3\2\2\2\u0140\u013e",
-                      "\3\2\2\2\u0140\u013f\3\2\2\2\u0141/\3\2\2\2\u0142\u0143\t\2\2\2\u0143",
-                      "\61\3\2\2\2/\63:>@HPSZ_chmpx|\u0081\u0085\u008e\u0092\u009a\u00a0\u00a8",
-                      "\u00b1\u00b7\u00bf\u00c3\u00cb\u00d1\u00d9\u00dd\u00ea\u00f1\u00fa",
-                      "\u00fe\u0102\u0106\u010a\u010e\u011a\u011d\u0120\u0127\u0130\u013a",
-                      "\u0140"].join("")
+											"\3 \u0145\4\2\t\2\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4",
+											"\t\t\t\4\n\t\n\4\13\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t",
+											"\20\4\21\t\21\4\22\t\22\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27",
+											"\t\27\4\30\t\30\4\31\t\31\3\2\5\2\64\n\2\3\2\3\2\3\2\7\29\n\2\f\2\16",
+											"\2<\13\2\3\2\5\2?\n\2\5\2A\n\2\3\2\3\2\3\3\3\3\3\3\3\3\5\3I\n\3\3\4",
+											"\3\4\3\4\3\4\7\4O\n\4\f\4\16\4R\13\4\5\4T\n\4\3\4\3\4\3\5\3\5\3\5\5",
+											"\5[\n\5\3\5\6\5^\n\5\r\5\16\5_\3\5\3\5\5\5d\n\5\3\5\7\5g\n\5\f\5\16",
+											"\5j\13\5\7\5l\n\5\f\5\16\5o\13\5\5\5q\n\5\3\5\3\5\3\6\3\6\6\6w\n\6",
+											"\r\6\16\6x\6\6{\n\6\r\6\16\6|\3\6\7\6\u0080\n\6\f\6\16\6\u0083\13\6",
+											"\3\6\5\6\u0086\n\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\5\7\u008f\n\7\3\b\3",
+											"\b\5\b\u0093\n\b\3\t\3\t\3\t\3\t\3\t\3\t\5\t\u009b\n\t\3\t\3\t\7\t",
+											"\u009f\n\t\f\t\16\t\u00a2\13\t\3\t\3\t\3\n\7\n\u00a7\n\n\f\n\16\n\u00aa",
+											"\13\n\3\13\3\13\3\13\3\13\3\13\3\13\5\13\u00b2\n\13\3\13\3\13\7\13",
+											"\u00b6\n\13\f\13\16\13\u00b9\13\13\3\13\3\13\3\f\6\f\u00be\n\f\r\f",
+											"\16\f\u00bf\3\r\3\r\5\r\u00c4\n\r\3\16\3\16\3\16\3\16\3\16\3\16\5\16",
+											"\u00cc\n\16\3\16\3\16\7\16\u00d0\n\16\f\16\16\16\u00d3\13\16\3\16\3",
+											"\16\3\17\6\17\u00d8\n\17\r\17\16\17\u00d9\3\20\3\20\5\20\u00de\n\20",
+											"\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00e9\n\21\f\21",
+											"\16\21\u00ec\13\21\3\21\3\21\3\21\3\21\5\21\u00f2\n\21\3\21\3\21\3",
+											"\22\3\22\3\22\7\22\u00f9\n\22\f\22\16\22\u00fc\13\22\3\23\5\23\u00ff",
+											"\n\23\3\23\3\23\5\23\u0103\n\23\3\23\3\23\5\23\u0107\n\23\3\23\3\23",
+											"\5\23\u010b\n\23\7\23\u010d\n\23\f\23\16\23\u0110\13\23\3\24\3\24\3",
+											"\24\3\24\3\24\3\24\3\24\3\24\3\24\5\24\u011b\n\24\3\25\5\25\u011e\n",
+											"\25\3\25\5\25\u0121\n\25\3\25\3\25\3\25\7\25\u0126\n\25\f\25\16\25",
+											"\u0129\13\25\3\26\3\26\3\26\3\26\7\26\u012f\n\26\f\26\16\26\u0132\13",
+											"\26\3\26\3\26\3\27\3\27\3\27\3\27\3\27\5\27\u013b\n\27\3\30\3\30\3",
+											"\30\3\30\5\30\u0141\n\30\3\31\3\31\3\31\2\2\32\2\4\6\b\n\f\16\20\22",
+											"\24\26\30\32\34\36 \"$&(*,.\60\2\4\6\2\4\6\17\17\21\21\23\23\3\2\34",
+											"\35\2\u0165\2@\3\2\2\2\4H\3\2\2\2\6J\3\2\2\2\bW\3\2\2\2\nz\3\2\2\2",
+											"\f\u008e\3\2\2\2\16\u0092\3\2\2\2\20\u0094\3\2\2\2\22\u00a8\3\2\2\2",
+											"\24\u00ab\3\2\2\2\26\u00bd\3\2\2\2\30\u00c3\3\2\2\2\32\u00c5\3\2\2",
+											"\2\34\u00d7\3\2\2\2\36\u00dd\3\2\2\2 \u00df\3\2\2\2\"\u00f5\3\2\2\2",
+											"$\u00fe\3\2\2\2&\u011a\3\2\2\2(\u011d\3\2\2\2*\u012a\3\2\2\2,\u013a",
+											"\3\2\2\2.\u0140\3\2\2\2\60\u0142\3\2\2\2\62\64\5\4\3\2\63\62\3\2\2",
+											"\2\63\64\3\2\2\2\64A\3\2\2\2\65:\5\4\3\2\66\67\7\t\2\2\679\5\4\3\2",
+											"8\66\3\2\2\29<\3\2\2\2:8\3\2\2\2:;\3\2\2\2;>\3\2\2\2<:\3\2\2\2=?\7",
+											"\t\2\2>=\3\2\2\2>?\3\2\2\2?A\3\2\2\2@\63\3\2\2\2@\65\3\2\2\2AB\3\2",
+											"\2\2BC\7\2\2\3C\3\3\2\2\2DI\5\6\4\2EI\5\b\5\2FI\5\20\t\2GI\5\f\7\2",
+											"HD\3\2\2\2HE\3\2\2\2HF\3\2\2\2HG\3\2\2\2I\5\3\2\2\2JS\7\13\2\2KP\5",
+											"\30\r\2LM\7\t\2\2MO\5\30\r\2NL\3\2\2\2OR\3\2\2\2PN\3\2\2\2PQ\3\2\2",
+											"\2QT\3\2\2\2RP\3\2\2\2SK\3\2\2\2ST\3\2\2\2TU\3\2\2\2UV\7\f\2\2V\7\3",
+											"\2\2\2Wp\7\r\2\2X[\5\36\20\2Y[\5\n\6\2ZX\3\2\2\2ZY\3\2\2\2[m\3\2\2",
+											"\2\\^\7\t\2\2]\\\3\2\2\2^_\3\2\2\2_]\3\2\2\2_`\3\2\2\2`c\3\2\2\2ad",
+											"\5\36\20\2bd\5\n\6\2ca\3\2\2\2cb\3\2\2\2dh\3\2\2\2eg\7\t\2\2fe\3\2",
+											"\2\2gj\3\2\2\2hf\3\2\2\2hi\3\2\2\2il\3\2\2\2jh\3\2\2\2k]\3\2\2\2lo",
+											"\3\2\2\2mk\3\2\2\2mn\3\2\2\2nq\3\2\2\2om\3\2\2\2pZ\3\2\2\2pq\3\2\2",
+											"\2qr\3\2\2\2rs\7\16\2\2s\t\3\2\2\2tv\5\36\20\2uw\7\7\2\2vu\3\2\2\2",
+											"wx\3\2\2\2xv\3\2\2\2xy\3\2\2\2y{\3\2\2\2zt\3\2\2\2{|\3\2\2\2|z\3\2",
+											"\2\2|}\3\2\2\2}\u0081\3\2\2\2~\u0080\5\36\20\2\177~\3\2\2\2\u0080\u0083",
+											"\3\2\2\2\u0081\177\3\2\2\2\u0081\u0082\3\2\2\2\u0082\u0085\3\2\2\2",
+											"\u0083\u0081\3\2\2\2\u0084\u0086\7\7\2\2\u0085\u0084\3\2\2\2\u0085",
+											"\u0086\3\2\2\2\u0086\13\3\2\2\2\u0087\u0088\t\2\2\2\u0088\u0089\7\b",
+											"\2\2\u0089\u008f\5\16\b\2\u008a\u008b\7\21\2\2\u008b\u008f\5\6\4\2",
+											"\u008c\u008d\7\21\2\2\u008d\u008f\5\b\5\2\u008e\u0087\3\2\2\2\u008e",
+											"\u008a\3\2\2\2\u008e\u008c\3\2\2\2\u008f\r\3\2\2\2\u0090\u0093\5,\27",
+											"\2\u0091\u0093\5 \21\2\u0092\u0090\3\2\2\2\u0092\u0091\3\2\2\2\u0093",
+											"\17\3\2\2\2\u0094\u0095\7\25\2\2\u0095\u0096\5$\23\2\u0096\u0097\7",
+											"\27\2\2\u0097\u00a0\5\22\n\2\u0098\u009a\7\30\2\2\u0099\u009b\5$\23",
+											"\2\u009a\u0099\3\2\2\2\u009a\u009b\3\2\2\2\u009b\u009c\3\2\2\2\u009c",
+											"\u009d\7\27\2\2\u009d\u009f\5\22\n\2\u009e\u0098\3\2\2\2\u009f\u00a2",
+											"\3\2\2\2\u00a0\u009e\3\2\2\2\u00a0\u00a1\3\2\2\2\u00a1\u00a3\3\2\2",
+											"\2\u00a2\u00a0\3\2\2\2\u00a3\u00a4\7 \2\2\u00a4\21\3\2\2\2\u00a5\u00a7",
+											"\5\4\3\2\u00a6\u00a5\3\2\2\2\u00a7\u00aa\3\2\2\2\u00a8\u00a6\3\2\2",
+											"\2\u00a8\u00a9\3\2\2\2\u00a9\23\3\2\2\2\u00aa\u00a8\3\2\2\2\u00ab\u00ac",
+											"\7\25\2\2\u00ac\u00ad\5$\23\2\u00ad\u00ae\7\27\2\2\u00ae\u00b7\5\26",
+											"\f\2\u00af\u00b1\7\30\2\2\u00b0\u00b2\5$\23\2\u00b1\u00b0\3\2\2\2\u00b1",
+											"\u00b2\3\2\2\2\u00b2\u00b3\3\2\2\2\u00b3\u00b4\7\27\2\2\u00b4\u00b6",
+											"\5\26\f\2\u00b5\u00af\3\2\2\2\u00b6\u00b9\3\2\2\2\u00b7\u00b5\3\2\2",
+											"\2\u00b7\u00b8\3\2\2\2\u00b8\u00ba\3\2\2\2\u00b9\u00b7\3\2\2\2\u00ba",
+											"\u00bb\7 \2\2\u00bb\25\3\2\2\2\u00bc\u00be\5\30\r\2\u00bd\u00bc\3\2",
+											"\2\2\u00be\u00bf\3\2\2\2\u00bf\u00bd\3\2\2\2\u00bf\u00c0\3\2\2\2\u00c0",
+											"\27\3\2\2\2\u00c1\u00c4\5\f\7\2\u00c2\u00c4\5\24\13\2\u00c3\u00c1\3",
+											"\2\2\2\u00c3\u00c2\3\2\2\2\u00c4\31\3\2\2\2\u00c5\u00c6\7\25\2\2\u00c6",
+											"\u00c7\5$\23\2\u00c7\u00c8\7\27\2\2\u00c8\u00d1\5\34\17\2\u00c9\u00cb",
+											"\7\30\2\2\u00ca\u00cc\5$\23\2\u00cb\u00ca\3\2\2\2\u00cb\u00cc\3\2\2",
+											"\2\u00cc\u00cd\3\2\2\2\u00cd\u00ce\7\27\2\2\u00ce\u00d0\5\34\17\2\u00cf",
+											"\u00c9\3\2\2\2\u00d0\u00d3\3\2\2\2\u00d1\u00cf\3\2\2\2\u00d1\u00d2",
+											"\3\2\2\2\u00d2\u00d4\3\2\2\2\u00d3\u00d1\3\2\2\2\u00d4\u00d5\7 \2\2",
+											"\u00d5\33\3\2\2\2\u00d6\u00d8\5\36\20\2\u00d7\u00d6\3\2\2\2\u00d8\u00d9",
+											"\3\2\2\2\u00d9\u00d7\3\2\2\2\u00d9\u00da\3\2\2\2\u00da\35\3\2\2\2\u00db",
+											"\u00de\5.\30\2\u00dc\u00de\5\32\16\2\u00dd\u00db\3\2\2\2\u00dd\u00dc",
+											"\3\2\2\2\u00de\37\3\2\2\2\u00df\u00e0\7\25\2\2\u00e0\u00e1\5$\23\2",
+											"\u00e1\u00f1\7\27\2\2\u00e2\u00ea\5\"\22\2\u00e3\u00e4\7\30\2\2\u00e4",
+											"\u00e5\5$\23\2\u00e5\u00e6\7\27\2\2\u00e6\u00e7\5\"\22\2\u00e7\u00e9",
+											"\3\2\2\2\u00e8\u00e3\3\2\2\2\u00e9\u00ec\3\2\2\2\u00ea\u00e8\3\2\2",
+											"\2\u00ea\u00eb\3\2\2\2\u00eb\u00ed\3\2\2\2\u00ec\u00ea\3\2\2\2\u00ed",
+											"\u00ee\7\30\2\2\u00ee\u00ef\7\27\2\2\u00ef\u00f0\5\"\22\2\u00f0\u00f2",
+											"\3\2\2\2\u00f1\u00e2\3\2\2\2\u00f1\u00f2\3\2\2\2\u00f2\u00f3\3\2\2",
+											"\2\u00f3\u00f4\7 \2\2\u00f4!\3\2\2\2\u00f5\u00fa\5\16\b\2\u00f6\u00f7",
+											"\7\7\2\2\u00f7\u00f9\5\16\b\2\u00f8\u00f6\3\2\2\2\u00f9\u00fc\3\2\2",
+											"\2\u00fa\u00f8\3\2\2\2\u00fa\u00fb\3\2\2\2\u00fb#\3\2\2\2\u00fc\u00fa",
+											"\3\2\2\2\u00fd\u00ff\7\36\2\2\u00fe\u00fd\3\2\2\2\u00fe\u00ff\3\2\2",
+											"\2\u00ff\u0102\3\2\2\2\u0100\u0103\5(\25\2\u0101\u0103\5*\26\2\u0102",
+											"\u0100\3\2\2\2\u0102\u0101\3\2\2\2\u0103\u010e\3\2\2\2\u0104\u0106",
+											"\t\3\2\2\u0105\u0107\7\36\2\2\u0106\u0105\3\2\2\2\u0106\u0107\3\2\2",
+											"\2\u0107\u010a\3\2\2\2\u0108\u010b\5(\25\2\u0109\u010b\5*\26\2\u010a",
+											"\u0108\3\2\2\2\u010a\u0109\3\2\2\2\u010b\u010d\3\2\2\2\u010c\u0104",
+											"\3\2\2\2\u010d\u0110\3\2\2\2\u010e\u010c\3\2\2\2\u010e\u010f\3\2\2",
+											"\2\u010f%\3\2\2\2\u0110\u010e\3\2\2\2\u0111\u011b\7\b\2\2\u0112\u011b",
+											"\7\31\2\2\u0113\u0114\7\31\2\2\u0114\u011b\7\b\2\2\u0115\u011b\7\32",
+											"\2\2\u0116\u0117\7\32\2\2\u0117\u011b\7\b\2\2\u0118\u0119\7\36\2\2",
+											"\u0119\u011b\7\b\2\2\u011a\u0111\3\2\2\2\u011a\u0112\3\2\2\2\u011a",
+											"\u0113\3\2\2\2\u011a\u0115\3\2\2\2\u011a\u0116\3\2\2\2\u011a\u0118",
+											"\3\2\2\2\u011b\'\3\2\2\2\u011c\u011e\7\21\2\2\u011d\u011c\3\2\2\2\u011d",
+											"\u011e\3\2\2\2\u011e\u0120\3\2\2\2\u011f\u0121\5&\24\2\u0120\u011f",
+											"\3\2\2\2\u0120\u0121\3\2\2\2\u0121\u0122\3\2\2\2\u0122\u0127\5,\27",
+											"\2\u0123\u0124\7\30\2\2\u0124\u0126\5,\27\2\u0125\u0123\3\2\2\2\u0126",
+											"\u0129\3\2\2\2\u0127\u0125\3\2\2\2\u0127\u0128\3\2\2\2\u0128)\3\2\2",
+											"\2\u0129\u0127\3\2\2\2\u012a\u012b\7\25\2\2\u012b\u0130\5$\23\2\u012c",
+											"\u012d\t\3\2\2\u012d\u012f\5$\23\2\u012e\u012c\3\2\2\2\u012f\u0132",
+											"\3\2\2\2\u0130\u012e\3\2\2\2\u0130\u0131\3\2\2\2\u0131\u0133\3\2\2",
+											"\2\u0132\u0130\3\2\2\2\u0133\u0134\7 \2\2\u0134+\3\2\2\2\u0135\u013b",
+											"\5\6\4\2\u0136\u013b\5\b\5\2\u0137\u013b\5\n\6\2\u0138\u013b\5\f\7",
+											"\2\u0139\u013b\5\60\31\2\u013a\u0135\3\2\2\2\u013a\u0136\3\2\2\2\u013a",
+											"\u0137\3\2\2\2\u013a\u0138\3\2\2\2\u013a\u0139\3\2\2\2\u013b-\3\2\2",
+											"\2\u013c\u0141\5\6\4\2\u013d\u0141\5\f\7\2\u013e\u0141\5\b\5\2\u013f",
+											"\u0141\5\60\31\2\u0140\u013c\3\2\2\2\u0140\u013d\3\2\2\2\u0140\u013e",
+											"\3\2\2\2\u0140\u013f\3\2\2\2\u0141/\3\2\2\2\u0142\u0143\t\2\2\2\u0143",
+											"\61\3\2\2\2/\63:>@HPSZ_chmpx|\u0081\u0085\u008e\u0092\u009a\u00a0\u00a8",
+											"\u00b1\u00b7\u00bf\u00c3\u00cb\u00d1\u00d9\u00dd\u00ea\u00f1\u00fa",
+											"\u00fe\u0102\u0106\u010a\u010e\u011a\u011d\u0120\u0127\u0130\u013a",
+											"\u0140"].join("")
 
 	@@_ATN = Antlr4::Runtime::ATNDeserializer.new().deserialize(@@_serializedATN)
 

data/lib/modl/parser/class_processor.rb

@@ -22,8 +22,29 @@ module MODL
 
       private
 
+      def self.check_class_type(global, key, value)
+        clazz = global.classs(key)
+        top = top_class(clazz, global)
+        case top
+        when 'num'
+          unless value.is_a?(Numeric)
+            raise InterpreterError, 'Interpreter Error: Numeric value expected, but found: ' + value.to_s + ' of type ' + value.class.to_s
+          end
+          return value
+        when 'str'
+          return value.to_s
+        end
+        value
+      end
+
       # Process the contents of the supplied hash obj
       def self.process_obj(global, obj)
+        if obj.length == 1
+          k = obj.keys[0]
+          nv = check_class_type(global, k, obj[k])
+          obj[k] = nv
+        end
+
         obj.keys.each do |k|
           value = obj[k]
           # Does the key refer to a class that we have parsed or loaded?
@@ -32,17 +53,45 @@ module MODL
             # Yes so convert this value to an instance of that class
             new_k, new_v = process_class global, k, value
             # Replace the existing object with the new class instance and a new key
-            obj.delete k
-            obj[new_k] = new_v
+            # We need to keep the same key order, hence this method below
+            replaceValue(obj, k, new_k, new_v)
+          else
+            new_v = value
           end
           # Recurse into the value in case it has contents that also refer to classes.
-          process global, value
+          process global, new_v
+        end
+      end
+
+      def self.replaceValue(obj, old_k, new_k, new_v)
+        tmp = obj.dup
+        obj.clear
+        tmp.keys.each do |tmpk|
+          tmpv = tmp[tmpk]
+          if tmpk == old_k
+            obj[new_k] = new_v
+          else
+            obj[tmpk] = tmpv
+          end
         end
       end
 
       # Convert the supplied object val into an instance of the class with key k
       def self.process_class(global, k, v)
         clazz = global.classs(k)
+        if k != clazz.id && !(v.is_a?(Hash) || v.is_a?(Array))
+          return [k, v]
+        end
+
+        if k == clazz.name && !(v.is_a?(Array) || v.is_a?(Hash))
+          new_value = transform_to_class(clazz, global, [v], true)
+          if new_value.is_a?(Array) && new_value.length == 1
+            return [clazz.name_or_id, new_value[0]]
+          else
+            return [clazz.name_or_id, new_value]
+          end
+        end
+
         new_value = transform_to_class(clazz, global, v)
 
         if v.is_a?(Array)
@@ -68,7 +117,6 @@ module MODL
           end
         end
 
-        process_nested_classes(global, new_value)
         [clazz.name_or_id, new_value]
       end
 
@@ -113,8 +161,7 @@ module MODL
 
             # Replace the value for this key if we've changed anything.
             if new_value[new_k] != new_v
-              new_value.delete nk
-              new_value[new_k] = new_v
+              replaceValue(new_value, new_k, new_k, new_v)
             end
           end
         elsif new_value.is_a?(Array)
@@ -126,17 +173,25 @@ module MODL
 
       # Process the *assign lists ('keylist' in this code) and any extra pairs defined by the class.
       # The id, name, and superclass can be ignored here.
-      def self.transform_to_class(clazz, global, v)
+      def self.transform_to_class(clazz, global, v, ignore_assign = false)
         new_value = {} # the replacement for val after conversion to a class instance
+        process_nested_classes(global, v)
 
         # Process the key list if we found one otherwise raise an error
         # Slightly different processing for hashes and arrays
-        if v.is_a? Array
-          keys = key_list(global, clazz, v.length)
-          lam = ->(i) {v[i]}
-        elsif !v.is_a?(Hash)
-          keys = key_list(global, clazz, 1)
-          lam = ->(i) {v}
+        unless ignore_assign
+          if v.is_a? Array
+            keys = key_list(global, clazz, v.length)
+            if keys.empty?
+              return v
+            else
+              lam = ->(i) {v[i]}
+            end
+          elsif !v.is_a?(Hash)
+            keys = key_list(global, clazz, 1)
+            lam = ->(i) {v}
+            return v if keys.length.zero?
+          end
         end
 
         keys&.each_index do |i|
@@ -162,6 +217,7 @@ module MODL
       def self.top_class(clazz, global, depth = 0)
         # Check for self-referential classes that cause infinite recursion
         return if depth > MAX_RECURSION_DEPTH
+        return nil? if clazz.nil?
 
         superclass = clazz.superclass
         c = global.classs(superclass)

data/lib/modl/parser/interpreter.rb

@@ -11,20 +11,14 @@ module MODL
   class InterpreterError < StandardError
   end
 
+  class ParserError < StandardError
+  end
+
   # This is the main Ruby Interpreter entry point. Supply a String containing MODL text and it will return a String
   # containing the JSON equivalent. The JSON isn't pretty-printed unless pretty is true
   class Interpreter
     def self.interpret(str, pretty = false)
-      # Parse the MODL string into a MODL::Parser::Parsed object.
-      parsed = MODL::Parser::Parser.parse str
-
-      # Convert the Parsed object into a simpler structure of and Array or Hash
-      interpreted = parsed.extract_hash
-
-      # Process any class definitions used by the MODL file.
-      MODL::Parser::ClassProcessor.process(parsed.global, interpreted)
-      MODL::Parser::InstructionProcessor.process(parsed.global, interpreted)
-      # If the result is a simple string then just return it.
+      interpreted = MODL.parse(str)
       return interpreted if interpreted.is_a? String
 
       # Otherwise generate a JSON string.

data/lib/modl/parser/modl_class.rb

@@ -22,7 +22,7 @@ module MODL
           return kl if kl.length == len
         end
         raise InterpreterError,
-              'No key list of the correct length in class ' + @id + ' - looking for one of length ' + len.to_s
+              'Interpreter Error: No key list of the correct length in class ' + @id + ' - looking for one of length ' + len.to_s
       end
 
       def merge_content(new_value)

data/lib/modl/parser/parsed.rb

@@ -344,10 +344,8 @@ module MODL
             IndexExtractor.extract(self, @global)
           when 'hidden'
             extract_value
-            invoke_deref
           else
             extract_value
-            invoke_deref
           end
 
           return if @global.in_condition? # Don't store pairs in conditionals until we evaluate the conditions
@@ -1401,7 +1399,7 @@ module MODL
         end
         case result.length
         when 0
-          return ''
+          return nil
         when 1
           return result[0]
         end

data/lib/modl/parser/parser.rb

@@ -23,18 +23,24 @@ module MODL
           parsed = Parsed.new(global)
           parser.modl.enter_rule(parsed)
           parsed
+        rescue Antlr4::Runtime::ParseCancellationException => e
+          check_modl_version(global)
+          raise ParserError, 'Parser Error: ' + e.message
         rescue StandardError => e
-          puts e.message
-          puts e.backtrace
-
-          if global.syntax_version > global.interpreter_syntax_version
-            raise InterpreterError, 'MODL Version ' +
-                global.interpreter_syntax_version.to_s +
-                ' interpreter cannot process this MODL Version ' +
-                global.syntax_version.to_s + ' file.'
-          end
+          check_modl_version(global)
+          raise InterpreterError, 'Interpreter Error: ' + e.message
+        rescue InterpreterError => e
+          check_modl_version(global)
+          raise InterpreterError, 'Interpreter Error: ' + e.message
+        end
+      end
 
-          raise InterpreterError, 'Parser Error: ' + e.message
+      def self.check_modl_version(global)
+        if global.syntax_version > global.interpreter_syntax_version
+          raise InterpreterError, 'Interpreter Error: MODL Version ' +
+              global.interpreter_syntax_version.to_s +
+              ' interpreter cannot process this MODL Version ' +
+              global.syntax_version.to_s + ' file.'
         end
       end
     end

data/lib/modl/parser/version.rb

@@ -1,5 +1,5 @@
 module MODL
   module Parser
-    VERSION = "0.3.5"
+    VERSION = "0.3.6"
   end
 end

data/modl.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'antlr4-runtime', '>= 0.0.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_runtime_dependency 'antlr4-runtime', '= 0.2.1'
+  spec.add_runtime_dependency 'antlr4-runtime', '= 0.2.3'
   spec.add_runtime_dependency 'punycode4r', '>= 0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr4-runtime
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: punycode4r
   requirement: !ruby/object:Gem::Requirement