modl 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f3321cf2f6325e99bae9efc3cfb8630ff764ff68e8b12378a517dcf60edc10
-  data.tar.gz: ed2c4999d2e0d2abd71f2fe11b377594ba8356e9a2b9a8f42e61c6af911e0f84
+  metadata.gz: d523ed6cc09d2f413a4f0df27405a219d107c5f5219e2a8fcb2acb78f3f42370
+  data.tar.gz: 0cb8e6e85ca9d0421f87ca0a77532fe1a1c740864007136826b60eacab73f9ec
 SHA512:
-  metadata.gz: aa50e7a3e4e54ed5310363b196e27d154ea8d6691e12c1a0a29d4d946a32602cabc8219293b2e7ff7dfbdc2c49e6b5bcd77b0b27aedc83c157fcffa137724bb1
-  data.tar.gz: 9e5e8f8ae9634da50f48b64710864c2aa55c1f51b819943d2f646f788c07a7418b2b375569a3743f9e22edd86d85c6afe57bd87a577d5500e2c715414dd11c6c
+  metadata.gz: d3aa20fafe4caddf80691a676ff0e3e60c6a12b75a0831594d2dd676f31a9198926b4deef043502d9855bb247673368df449b74793db279afd9f162e4e88e030
+  data.tar.gz: 61414bce44abce673ce36303aa53aa981cf8445fd22d43a7843dc8d6fa906f4a466da3726bb883a730ead90daeb773df0a17eafd486dfd024a0ee1963344b2bd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.3.5
+===
+- Fixed another bug with class handling to expand classes properly.
+
 0.3.4
 ===
 - Fixed a bug with class handling to expand classes properly.

data/grammar_tests/base_tests.json

@@ -992,5 +992,8 @@
     "expected_output": "{\"a\":3}"},
   {"input": "x=[1;;;;;;;2:::::::::3;;;;;;;;;;4:::::::::5]",
     "minimised_modl": "x=[1;;;;;;;2:::::::::3;;;;;;;;;;4:::::::::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] ]}"}
+    "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"}
 ]

data/lib/modl/parser/class_processor.rb

@@ -151,13 +151,10 @@ module MODL
       end
 
       def self.key_list(global, clazz, len)
+        return [] if clazz.nil?
         list = clazz.keylist_of_length(len)
         return list if !list.nil? && list.length > 0
         superclass = global.classs(clazz.superclass)
-        if superclass.nil?
-          raise InterpreterError,
-                'No key list of the correct length in class ' + clazz.name_or_id + ' - looking for one of length ' + len.to_s
-        end
         key_list(global, superclass, len)
       end
 

data/lib/modl/parser/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Tony Walmsley