modl 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 583a99cd420de4767e4fdcc6bec00feeb360ddd9f404b941bba4937a1e38ebaa
-  data.tar.gz: 6a9e4b47c3b3e2c7312fe661267d4b38488b9037ba7a9c352d45667acc2d795c
+  metadata.gz: 1827bb8abaccc7771bf7ea845006a499b798f37f7697949efec86d539df88815
+  data.tar.gz: c534d0b8a027287698d2a624c664ec19cced108a579b2b52f0518c8d9a09a2c5
 SHA512:
-  metadata.gz: 7617ea87f64cf64f5a93e5029d9f13099ef1a825936eb2ef1680c2a81163f75716963b3d197b8de5cca4be167035aad008b82312b3ca289ea482bd943e566da6
-  data.tar.gz: 22e49cbcdf82cc0219698e35fa38cd21039c772bd2b0d7095c2703fd2587d2612af9e62b00b0364a371f044c1d0d341b4f5217f1db032d737fcac6f21a06a9d5
+  metadata.gz: 4d4d737f13ad9508ba7fcdc5a9187d457d6eb03fa445b9f934eaa982c4cb36fd5f114f9b4a039c8dc8015facb2dda1b8816327b56fcd346619ea534ded83b59e
+  data.tar.gz: d668afa32aedf30f3ebf949a1a8f64962986c558a122c5b2d1b0b8c84c495e8fa5bce7b5a729c7a2b4f44044dac6d3bb1871268806f972f8a7967d0916a1d443

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.3.12
+===
+- Use file cache on load error - GitHub issue #20
+- Error converting value to number - GitHub issue #21
+- Problem with punycode - GitHub issue #22
+- Handle orphan pairs - adopt then into a map
+
 0.3.11
 ===
 - Support conditional file loading.

data/grammar_tests/base_tests.json

@@ -393,7 +393,7 @@
   {
     "id": "42",
     "input": "*class(*id=object;*superclass=arr);sales(name=John Smith;telephone=44800 555 555);service(name=Jim Brown;telephone=44800 666 666)",
-    "expected_output": "[\n    {\n        \"sales\": {\n            \"name\": \"John Smith\",\n            \"telephone\": \"44800 555 555\"\n        }\n    },\n    {\n        \"service\": {\n            \"name\": \"Jim Brown\",\n            \"telephone\": \"44800 666 666\"\n        }\n    }\n]",
+    "expected_output": "{\n    \"sales\": {\n        \"name\": \"John Smith\",\n        \"telephone\": \"44800 555 555\"\n    },\n    \"service\": {\n        \"name\": \"Jim Brown\",\n        \"telephone\": \"44800 666 666\"\n    }\n}",
     "tested_features": [
       "class"
     ],
@@ -474,7 +474,7 @@
   {
     "id": "51",
     "input": "?=one:two:three;test1=%0;test2=%1;test3=%2;test4=%3;test5=%4;test6=%5;test7=%6;test8=%7;test9=%8",
-    "expected_output": "[\n    {\n        \"test1\": \"one\"\n    },\n    {\n        \"test2\": \"two\"\n    },\n    {\n        \"test3\": \"three\"\n    },\n    {\n        \"test4\": \"%3\"\n    },\n    {\n        \"test5\": \"%4\"\n    },\n    {\n        \"test6\": \"%5\"\n    },\n    {\n        \"test7\": \"%6\"\n    },\n    {\n        \"test8\": \"%7\"\n    },\n    {\n        \"test9\": \"%8\"\n    }\n]",
+    "expected_output": "{\n    \"test1\": \"one\",\n    \"test2\": \"two\",\n    \"test3\": \"three\",\n    \"test4\": \"%3\",\n    \"test5\": \"%4\",\n    \"test6\": \"%5\",\n    \"test7\": \"%6\",\n    \"test8\": \"%7\",\n    \"test9\": \"%8\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -483,7 +483,7 @@
   {
     "id": "52",
     "input": "a=1:2:3;b=4:5:6",
-    "expected_output": "[\n    {\n        \"a\": [\n            1,\n            2,\n            3\n        ]\n    },\n    {\n        \"b\": [\n            4,\n            5,\n            6\n        ]\n    }\n]",
+    "expected_output": "{\n    \"a\": [\n        1,\n        2,\n        3\n    ],\n    \"b\": [\n        4,\n        5,\n        6\n    ]\n}",
     "tested_features": [
       "nbArray"
     ],
@@ -510,7 +510,7 @@
   {
     "id": "55",
     "input": "a=1:2:3;\nb=4:5:6",
-    "expected_output": "[\n    {\n        \"a\": [\n            1,\n            2,\n            3\n        ]\n    },\n    {\n        \"b\": [\n            4,\n            5,\n            6\n        ]\n    }\n]",
+    "expected_output": "{\n    \"a\": [\n        1,\n        2,\n        3\n    ],\n    \"b\": [\n        4,\n        5,\n        6\n    ]\n}",
     "tested_features": [
       "nbArray"
     ],
@@ -528,7 +528,7 @@
   {
     "id": "57",
     "input": "a=1:2:3\n;\nb=4:5:6",
-    "expected_output": "[\n    {\n        \"a\": [\n            1,\n            2,\n            3\n        ]\n    },\n    {\n        \"b\": [\n            4,\n            5,\n            6\n        ]\n    }\n]",
+    "expected_output": "{\n    \"a\": [\n        1,\n        2,\n        3\n    ],\n    \"b\": [\n        4,\n        5,\n        6\n    ]\n}",
     "tested_features": [
       "nbArray"
     ],
@@ -546,7 +546,7 @@
   {
     "id": "59",
     "input": "a(b(c(d(e(f=1)))));\ntesting=%a.b.c.d.e.f",
-    "expected_output": "[\n    {\n        \"a\": {\n            \"b\": {\n                \"c\": {\n                    \"d\": {\n                        \"e\": {\n                            \"f\": 1\n                        }\n                    }\n                }\n            }\n        }\n    },\n    {\n        \"testing\": 1\n    }\n]",
+    "expected_output": "{\n    \"a\": {\n        \"b\": {\n            \"c\": {\n                \"d\": {\n                    \"e\": {\n                        \"f\": 1\n                    }\n                }\n            }\n        }\n    },\n    \"testing\": 1\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -564,7 +564,7 @@
   {
     "id": "61",
     "input": "a=\nb\n=c;\nd=e",
-    "expected_output": "[\n    {\n        \"a\": {\n            \"b\": \"c\"\n        }\n    },\n    {\n        \"d\": \"e\"\n    }\n]",
+    "expected_output": "{\n    \"a\": {\n        \"b\": \"c\"\n    },\n    \"d\": \"e\"\n}",
     "tested_features": [
       "map"
     ],
@@ -573,7 +573,7 @@
   {
     "id": "62",
     "input": "test=this is a #hashtag test;test2=#testing 123",
-    "expected_output": "[\n    {\n        \"test\": \"this is a #hashtag test\"\n    },\n    {\n        \"test2\": \"#testing 123\"\n    }\n]",
+    "expected_output": "{\n    \"test\": \"this is a #hashtag test\",\n    \"test2\": \"#testing 123\"\n}",
     "tested_features": [
       "pair"
     ],
@@ -609,7 +609,7 @@
   {
     "id": "66",
     "input": "country=gb;\nx=[{ country=gb ? this /country=us? that }]",
-    "expected_output": "[\n    {\n        \"country\": \"gb\"\n    },\n    {\n        \"x\": [\n            \"this\"\n        ]\n    }\n]",
+    "expected_output": "{\n    \"country\": \"gb\",\n    \"x\": [\n        \"this\"\n    ]\n}",
     "tested_features": [
       "object_ref",
       "conditional"
@@ -628,12 +628,12 @@
   },
   {
     "id": "68",
-    "input": "a=1;b=2;b={{a=1}|{b=2}?true/?false}",
-    "expected_output": "[\n    {\n        \"a\": 1\n    },\n    {\n        \"b\": 2\n    },\n    {\n        \"b\": true\n    }\n]",
+    "input": "a=1;b=2;c={{a=1}|{b=2}?true/?false}",
+    "expected_output": "{\n    \"a\": 1,\n    \"b\": 2,\n    \"c\": true\n}",
     "tested_features": [
       "conditional"
     ],
-    "minimised_modl": "a=1;b=2;b={{a=1}|{b=2}?true/?false}"
+    "minimised_modl": "a=1;b=2;c={{a=1}|{b=2}?true/?false}"
   },
   {
     "id": "69",
@@ -658,7 +658,7 @@
   {
     "id": "71",
     "input": "_testing = quick-test of John's variable_methods;\nupcase_example = %testing.u;\ndowncase_example = %testing.d;\ninitcap_example = %testing.i;\nsentence_example = %testing.s;\nurl_encode_example = %testing.u.e",
-    "expected_output": "[\n    {\n        \"upcase_example\": \"QUICK-TEST OF JOHN'S VARIABLE_METHODS\"\n    },\n    {\n        \"downcase_example\": \"quick-test of john's variable_methods\"\n    },\n    {\n        \"initcap_example\": \"Quick-test Of John's Variable_methods\"\n    },\n    {\n        \"sentence_example\": \"Quick-test of John's variable_methods\"\n    },\n    {\n        \"url_encode_example\": \"QUICK-TEST+OF+JOHN%27S+VARIABLE_METHODS\"\n    }\n]",
+    "expected_output": "{\n    \"upcase_example\": \"QUICK-TEST OF JOHN'S VARIABLE_METHODS\",\n    \"downcase_example\": \"quick-test of john's variable_methods\",\n    \"initcap_example\": \"Quick-test Of John's Variable_methods\",\n    \"sentence_example\": \"Quick-test of John's variable_methods\",\n    \"url_encode_example\": \"QUICK-TEST+OF+JOHN%27S+VARIABLE_METHODS\"\n}",
     "tested_features": [
       "string_method"
     ],
@@ -746,7 +746,7 @@
   {
     "id": "80",
     "input": "_root=tesco.com;\n_branch=direct.;\nnamespace1=%branch%numrecord.%root;\nnamespace2=%branch%_%root%.numq.net",
-    "expected_output": "[\n    {\n        \"namespace1\": \"direct.numrecord.tesco.com\"\n    },\n    {\n        \"namespace2\": \"direct._tesco.com.numq.net\"\n    }\n]",
+    "expected_output": "{\n    \"namespace1\": \"direct.numrecord.tesco.com\",\n    \"namespace2\": \"direct._tesco.com.numq.net\"\n}",
     "tested_features": [
       "object_ref",
       "graves"
@@ -882,7 +882,7 @@
   {
     "id": "94",
     "input": "_co=at;\n_l=de;\n{\n co=at?\n   country=Austria\n   language={\n     l=fr?\n       French\n     /l=de?\n       German\n     /?\n       Other\n   }\n /?\n   country=Other\n}",
-    "expected_output": "[\n    {\n        \"country\": \"Austria\"\n    },\n    {\n        \"language\": \"German\"\n    }\n]",
+    "expected_output": "{\n    \"country\": \"Austria\",\n    \"language\": \"German\"\n}",
     "tested_features": [
       "conditional"
     ],
@@ -891,7 +891,7 @@
   {
     "id": "95",
     "input": "true2 = 01;\ntrue1 = true;\nfalse2 = 00;\nfalse1 = false;\nnull2 = 000;\nnull1 = null",
-    "expected_output": "[\n    {\n        \"true2\": true\n    },\n    {\n        \"true1\": true\n    },\n    {\n        \"false2\": false\n    },\n    {\n        \"false1\": false\n    },\n    {\n        \"null2\": null\n    },\n    {\n        \"null1\": null\n    }\n]",
+    "expected_output": "{\n    \"true2\": true,\n    \"true1\": true,\n    \"false2\": false,\n    \"false1\": false,\n    \"null2\": null,\n    \"null1\": null\n}",
     "tested_features": [
       "bool",
       "map",
@@ -1075,7 +1075,7 @@
   {
     "id": "114",
     "input": "?[[a;b;c];[one;two;three]];letters=%0;numbers=%1",
-    "expected_output": "[\n    {\n        \"letters\": [\n            \"a\",\n            \"b\",\n            \"c\"\n        ]\n    },\n    {\n        \"numbers\": [\n            \"one\",\n            \"two\",\n            \"three\"\n        ]\n    }\n]",
+    "expected_output": "{\n    \"letters\": [\n        \"a\",\n        \"b\",\n        \"c\"\n    ],\n    \"numbers\": [\n        \"one\",\n        \"two\",\n        \"three\"\n    ]\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1084,7 +1084,7 @@
   {
     "id": "115",
     "input": "?=[a;b;c]:[one;two;three];letters=%0;numbers=%1",
-    "expected_output": "[\n    {\n        \"letters\": [\n            \"a\",\n            \"b\",\n            \"c\"\n        ]\n    },\n    {\n        \"numbers\": [\n            \"one\",\n            \"two\",\n            \"three\"\n        ]\n    }\n]",
+    "expected_output": "{\n    \"letters\": [\n        \"a\",\n        \"b\",\n        \"c\"\n    ],\n    \"numbers\": [\n        \"one\",\n        \"two\",\n        \"three\"\n    ]\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1130,7 +1130,7 @@
   {
     "id": "120",
     "input": "?[zero;one;two];\nfirst_var=%0;\nsecond_var=%1;\nthird_var=%2",
-    "expected_output": "[\n    {\n        \"first_var\": \"zero\"\n    },\n    {\n        \"second_var\": \"one\"\n    },\n    {\n        \"third_var\": \"two\"\n    }\n]",
+    "expected_output": "{\n    \"first_var\": \"zero\",\n    \"second_var\": \"one\",\n    \"third_var\": \"two\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1321,7 +1321,7 @@
   {
     "id": "140",
     "input": "?=0:1:2;\nzero=%0;\none=%1;\ntwo=%2",
-    "expected_output": "[\n    {\n        \"zero\": 0\n    },\n    {\n        \"one\": 1\n    },\n    {\n        \"two\": 2\n    }\n]",
+    "expected_output": "{\n    \"zero\": 0,\n    \"one\": 1,\n    \"two\": 2\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1330,7 +1330,7 @@
   {
     "id": "141",
     "input": "?=a:b:c;\nzero=%0;\none=%1;\ntwo=%2\n",
-    "expected_output": "[\n    {\n        \"zero\": \"a\"\n    },\n    {\n        \"one\": \"b\"\n    },\n    {\n        \"two\": \"c\"\n    }\n]",
+    "expected_output": "{\n    \"zero\": \"a\",\n    \"one\": \"b\",\n    \"two\": \"c\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1505,7 +1505,7 @@
   {
     "id": "159",
     "input": "COUNTRY=gb;\ncountry=The country is %COUNTRY",
-    "expected_output": "[\n    {\n        \"COUNTRY\": \"gb\"\n    },\n    {\n        \"country\": \"The country is gb\"\n    }\n]",
+    "expected_output": "{\n    \"COUNTRY\": \"gb\",\n    \"country\": \"The country is gb\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -1658,12 +1658,12 @@
   },
   {
     "id": "175",
-    "input": "*L=\"https://www.modl.uk/tests/message-thread.txt\";\n\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!",
+    "input": "*L=\"https://www.modl.uk/tests/message-thread.txt\";\n[\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!\n]",
     "expected_output": "[\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Hello, how are you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi, good thanks\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"How about you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Yes, fine thanks. What are you up to?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Just testing out MODL\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Cool!\",\n            \"method\": \"sms\"\n        }\n    }\n]",
     "tested_features": [
       "load"
     ],
-    "minimised_modl": "*L=\"https://www.modl.uk/demo/message-thread.txt\";m=out:2018-03-22 15~:25:Hi;m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!"
+    "minimised_modl": "*L=\"https://www.modl.uk/demo/message-thread.txt\";[m=out:2018-03-22 15~:25:Hi;m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!]"
   },
   {
     "id": "176",
@@ -1746,18 +1746,18 @@
   },
   {
     "id": "184",
-    "input": "*L=grammar_tests/demo_config;\n\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!",
+    "input": "*L=grammar_tests/demo_config;\n[\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!\n]",
     "expected_output": "[\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Hello, how are you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi, good thanks\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"How about you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Yes, fine thanks. What are you up to?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Just testing out MODL\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Cool!\",\n            \"method\": \"sms\"\n        }\n    }\n]",
     "tested_features": [
       "object_ref",
       "load"
     ],
-    "minimised_modl": "*L=grammar_tests/demo_config;m=out:2018-03-22 15~:25:Hi;m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!"
+    "minimised_modl": "*L=grammar_tests/demo_config;m=out:2018-03-22 15~:25:Hi;[m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!]"
   },
   {
     "id": "185",
     "input": "## country\n_c = us;\n## language\n_l = en;\n\n*L=grammar_tests/import_config.modl;\n\ncountry = %c;\nlanguage = %l;\ntime_zone = %tz",
-    "expected_output": "[\n    {\n        \"country\": \"us\"\n    },\n    {\n        \"language\": \"en\"\n    },\n    {\n        \"time_zone\": \"EST\"\n    }\n]",
+    "expected_output": "{\n    \"country\": \"us\",\n    \"language\": \"en\",\n    \"time_zone\": \"EST\"\n}",
     "tested_features": [
       "object_ref",
       "load",
@@ -1767,13 +1767,13 @@
   },
   {
     "id": "186",
-    "input": "*L=grammar_tests/test_import_dir/test_import.txt;\n\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!",
+    "input": "*L=grammar_tests/test_import_dir/test_import.txt;\n[\nm=out:2018-03-22 15\\:25:Hi;\nm=in:2018-03-22 15\\:26:Hello, how are you?;\nm=out:2018-03-22 15\\:25:Hi, good thanks;\nm=out:2018-03-22 15\\:26:How about you?;\nm=in:2018-03-22 15\\:26:Yes, fine thanks. What are you up to?;\nm=out:2018-03-22 15\\:25:Just testing out MODL;\nm=in:2018-03-22 15\\:26:Cool!\n]",
     "expected_output": "[\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Hello, how are you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Hi, good thanks\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"How about you?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Yes, fine thanks. What are you up to?\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"out\",\n            \"date_time\": \"2018-03-22 15:25\",\n            \"message\": \"Just testing out MODL\",\n            \"method\": \"sms\"\n        }\n    },\n    {\n        \"message\": {\n            \"direction\": \"in\",\n            \"date_time\": \"2018-03-22 15:26\",\n            \"message\": \"Cool!\",\n            \"method\": \"sms\"\n        }\n    }\n]",
     "tested_features": [
       "object_ref",
       "load"
     ],
-    "minimised_modl": "*L=grammar_tests/test_import_dir/test_import.txt;m=out:2018-03-22 15~:25:Hi;m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!"
+    "minimised_modl": "*L=grammar_tests/test_import_dir/test_import.txt;[m=out:2018-03-22 15~:25:Hi;m=in:2018-03-22 15~:26:Hello, how are you?;m=out:2018-03-22 15~:25:Hi, good thanks;m=out:2018-03-22 15~:26:How about you?;m=in:2018-03-22 15~:26:Yes, fine thanks. What are you up to?;m=out:2018-03-22 15~:25:Just testing out MODL;m=in:2018-03-22 15~:26:Cool!]"
   },
   {
     "id": "187",
@@ -1817,7 +1817,7 @@
   {
     "id": "191",
     "input": "one=1;two=2;three=3",
-    "expected_output": "[\n    {\n        \"one\": 1\n    },\n    {\n        \"two\": 2\n    },\n    {\n        \"three\": 3\n    }\n]",
+    "expected_output": "{\n    \"one\": 1,\n    \"two\": 2,\n    \"three\": 3\n}",
     "tested_features": [
       "map",
       "pair"
@@ -1836,14 +1836,14 @@
   },
   {
     "id": "193",
-    "input": "R=0;\nnumber=1;number=2;number=3",
-    "expected_output": "[\n    {\n        \"R\": 0\n    },\n    {\n        \"number\": 1\n    },\n    {\n        \"number\": 2\n    },\n    {\n        \"number\": 3\n    }\n]",
+    "input": "R=0;\nnumber1=1;number2=2;number3=3",
+    "expected_output": "{\n    \"R\": 0,\n    \"number1\": 1,\n    \"number2\": 2,\n    \"number3\": 3\n}",
     "tested_features": [
       "map",
       "array",
       "pair"
     ],
-    "minimised_modl": "R=0;number=1;number=2;number=3"
+    "minimised_modl": "R=0;number1=1;number2=2;number3=3"
   },
   {
     "id": "194",
@@ -1935,23 +1935,23 @@
   },
   {
     "id": "203",
-    "input": "o(n=test);\no(n=test2)",
-    "expected_output": "[\n    {\n        \"o\": {\n            \"n\": \"test\"\n        }\n    },\n    {\n        \"o\": {\n            \"n\": \"test2\"\n        }\n    }\n]",
+    "input": "o1(n=test);\no2(n=test2)",
+    "expected_output": "{\n    \"o1\": {\n        \"n\": \"test\"\n    },\n    \"o2\": {\n        \"n\": \"test2\"\n    }\n}",
     "tested_features": [
       "map",
       "array"
     ],
-    "minimised_modl": "o(n=test);o(n=test2)"
+    "minimised_modl": "o1(n=test);o2(n=test2)"
   },
   {
     "id": "204",
-    "input": "o(n=test);o(n=test2)",
-    "expected_output": "[\n    {\n        \"o\": {\n            \"n\": \"test\"\n        }\n    },\n    {\n        \"o\": {\n            \"n\": \"test2\"\n        }\n    }\n]",
+    "input": "o1(n=test);o2(n=test2)",
+    "expected_output": "{\n    \"o1\": {\n        \"n\": \"test\"\n    },\n    \"o2\": {\n        \"n\": \"test2\"\n    }\n}",
     "tested_features": [
       "map",
       "array"
     ],
-    "minimised_modl": "o(n=test);o(n=test2)"
+    "minimised_modl": "o1(n=test);o2(n=test2)"
   },
   {
     "id": "205",
@@ -2139,8 +2139,8 @@
   },
   {
     "id": "224",
-    "input": "b=2;c=2;d=2;e=2;a={{b=c & d=e}?v1:v2:v3/?v4:v5:v6}",
-    "expected_output": "[\n    {\n        \"b\": 2\n    },\n    {\n        \"c\": 2\n    },\n    {\n        \"d\": 2\n    },\n    {\n        \"e\": 2\n    },\n    {\n        \"a\": [\n            \"v1\",\n            \"v2\",\n            \"v3\"\n        ]\n    }\n]",
+    "input": "b=2;\nc=2;\nd=2;\ne=2;\na={\n  {b=c & d=e}?\n    v1:v2:v3\n  /?\n    v4:v5:v6\n  }",
+    "expected_output": "{\n    \"b\": 2,\n    \"c\": 2,\n    \"d\": 2,\n    \"e\": 2,\n    \"a\": [\n        \"v1\",\n        \"v2\",\n        \"v3\"\n    ]\n}",
     "tested_features": [
       "conditional"
     ],
@@ -2310,13 +2310,13 @@
   },
   {
     "id": "243",
-    "input": "tony=hungry;\nneeds_food_1={tony=hungry?true/?false};\nneeds_food_2={!tony=hungry?false/?true};\nneeds_food_3={tony!=hungry?false/?true};\nneeds_food_3={!tony!=hungry?true/?false}",
-    "expected_output": "[\n    {\n        \"tony\": \"hungry\"\n    },\n    {\n        \"needs_food_1\": true\n    },\n    {\n        \"needs_food_2\": true\n    },\n    {\n        \"needs_food_3\": true\n    },\n    {\n        \"needs_food_3\": true\n    }\n]",
+    "input": "tony=hungry;\nneeds_food_1={tony=hungry?true/?false};\nneeds_food_2={!tony=hungry?false/?true};\nneeds_food_3={tony!=hungry?false/?true};\nneeds_food_4={!tony!=hungry?true/?false}",
+    "expected_output": "{\n    \"tony\": \"hungry\",\n    \"needs_food_1\": true,\n    \"needs_food_2\": true,\n    \"needs_food_3\": true,\n    \"needs_food_4\": true\n}",
     "tested_features": [
       "object_ref",
       "conditional"
     ],
-    "minimised_modl": "tony=hungry\nneeds_food_1={tony=hungry?true/?false}\nneeds_food_2={!tony=hungry?false/?true}\nneeds_food_3={tony!=hungry?false/?true}\nneeds_food_3={!tony!=hungry?true/?false}"
+    "minimised_modl": "tony=hungry;needs_food_1={tony=hungry?true/?false};needs_food_2={!tony=hungry?false/?true};needs_food_3={tony!=hungry?false/?true};needs_food_4={!tony!=hungry?true/?false}"
   },
   {
     "id": "244",
@@ -2370,12 +2370,12 @@
   },
   {
     "id": "249",
-    "input": "*class(\n  *id=p;\n  *name=person;\n  *superclass=map;\n  actions=[call;email]\n);\n*class(\n  *id=c;\n  *name=customer;\n  *superclass=person;\n  *assign=[\n    [title;name;email]\n  ]\n);\n*class(\n  *id=e;\n  *name=employee;\n  *superclass=person;\n  *assign=[\n    [title;name;job_title;email]\n  ]\n);\n\n## An employee:\ne=Mr:John Smith:Sales Director:john.smith@example.com;\n## A customer:\nc=Mr:Joe Bloggs:joe.bloggs@example.com;\n## Another customer:\nc=Mrs:Jane Wilson:jane.wilson@example.com",
+    "input": "*class(\n  *id=p;\n  *name=person;\n  *superclass=map;\n  actions=[call;email]\n);\n*class(\n  *id=c;\n  *name=customer;\n  *superclass=person;\n  *assign=[\n    [title;name;email]\n  ]\n);\n*class(\n  *id=e;\n  *name=employee;\n  *superclass=person;\n  *assign=[\n    [title;name;job_title;email]\n  ]\n);\n[\n## An employee:\ne=Mr:John Smith:Sales Director:john.smith@example.com;\n## A customer:\nc=Mr:Joe Bloggs:joe.bloggs@example.com;\n## Another customer:\nc=Mrs:Jane Wilson:jane.wilson@example.com\n]",
     "expected_output": "[\n    {\n        \"employee\": {\n            \"title\": \"Mr\",\n            \"name\": \"John Smith\",\n            \"job_title\": \"Sales Director\",\n            \"email\": \"john.smith@example.com\",\n            \"actions\": [\n                \"call\",\n                \"email\"\n            ]\n        }\n    },\n    {\n        \"customer\": {\n            \"title\": \"Mr\",\n            \"name\": \"Joe Bloggs\",\n            \"email\": \"joe.bloggs@example.com\",\n            \"actions\": [\n                \"call\",\n                \"email\"\n            ]\n        }\n    },\n    {\n        \"customer\": {\n            \"title\": \"Mrs\",\n            \"name\": \"Jane Wilson\",\n            \"email\": \"jane.wilson@example.com\",\n            \"actions\": [\n                \"call\",\n                \"email\"\n            ]\n        }\n    }\n]",
     "tested_features": [
       "class"
     ],
-    "minimised_modl": "*class(*id=p;*name=person;*superclass=map;actions=[call;email]);*class(*id=c;*name=customer;*superclass=person;*assign=[[title;name;email]]);*class(*id=e;*name=employee;*superclass=person;*assign=[[title;name;job_title;email]]);## An employee:;e=Mr:John Smith:Sales Director:john.smith@example.com;## A customer:;c=Mr:Joe Bloggs:joe.bloggs@example.com;## Another customer:;c=Mrs:Jane Wilson:jane.wilson@example.com"
+    "minimised_modl": "*class(*id=p;*name=person;*superclass=map;actions=[call;email]);*class(*id=c;*name=customer;*superclass=person;*assign=[[title;name;email]]);*class(*id=e;*name=employee;*superclass=person;*assign=[[title;name;job_title;email]]);[## An employee:;e=Mr:John Smith:Sales Director:john.smith@example.com;## A customer:;c=Mr:Joe Bloggs:joe.bloggs@example.com;## Another customer:;c=Mrs:Jane Wilson:jane.wilson@example.com]"
   },
   {
     "id": "250",
@@ -2429,7 +2429,7 @@
   {
     "id": "255",
     "input": "*class(*id=a;*name=alpha);a=[1;2;3];b=4:5:6",
-    "expected_output": "[\n    {\n        \"alpha\": [\n            1,\n            2,\n            3\n        ]\n    },\n    {\n        \"b\": [\n            4,\n            5,\n            6\n        ]\n    }\n]",
+    "expected_output": "{\n    \"alpha\": [\n        1,\n        2,\n        3\n    ],\n    \"b\": [\n        4,\n        5,\n        6\n    ]\n}",
     "tested_features": [
       "class",
       "superclass_inference"
@@ -2596,7 +2596,7 @@
   {
     "id": "272",
     "input": "ref=123;\nkey=%ref%%",
-    "expected_output": "[\n    {\n        \"ref\": 123\n    },\n    {\n        \"key\": \"123%\"\n    }\n]",
+    "expected_output": "{\n    \"ref\": 123,\n    \"key\": \"123%\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2624,7 +2624,7 @@
   {
     "id": "275",
     "input": "vat=20;\ns=VAT at %vat% added",
-    "expected_output": "[\n    {\n        \"vat\": 20\n    },\n    {\n        \"s\": \"VAT at 20 added\"\n    }\n]",
+    "expected_output": "{\n    \"vat\": 20,\n    \"s\": \"VAT at 20 added\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2633,7 +2633,7 @@
   {
     "id": "276",
     "input": "vat=20;\ns=VAT at %vat%% added",
-    "expected_output": "[\n    {\n        \"vat\": 20\n    },\n    {\n        \"s\": \"VAT at 20% added\"\n    }\n]",
+    "expected_output": "{\n    \"vat\": 20,\n    \"s\": \"VAT at 20% added\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2669,7 +2669,7 @@
   {
     "id": "280",
     "input": "_a=one;\n_b=two;\n_c=three;\n\nd=%a:%b:%c;\ne=[%a;%b;%c]",
-    "expected_output": "[\n    {\n        \"d\": [\n            \"one\",\n            \"two\",\n            \"three\"\n        ]\n    },\n    {\n        \"e\": [\n            \"one\",\n            \"two\",\n            \"three\"\n        ]\n    }\n]",
+    "expected_output": "{\n    \"d\": [\n        \"one\",\n        \"two\",\n        \"three\"\n    ],\n    \"e\": [\n        \"one\",\n        \"two\",\n        \"three\"\n    ]\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2714,7 +2714,7 @@
   {
     "id": "285",
     "input": "_replace_me=new value;\n\none=%replace_me.u;\n\ntwo=`replace_me`.u;\n\nthree=`replace_me.u`;\n\nfour=`%replace_me.u`;\n\nfive=`%replace_me`.u;\n\nsix=%replace_me.u%_added;\n\nseven=replace_me.u;\n\neight=%`replace_me`.u;\n\nnine=%`replace_me`.u%;",
-    "expected_output": "[\n    {\n        \"one\": \"NEW VALUE\"\n    },\n    {\n        \"two\": \"`replace_me`.u\"\n    },\n    {\n        \"three\": \"replace_me.u\"\n    },\n    {\n        \"four\": \"NEW VALUE\"\n    },\n    {\n        \"five\": \"`new value`.u\"\n    },\n    {\n        \"six\": \"NEW VALUE_added\"\n    },\n    {\n        \"seven\": \"replace_me.u\"\n    },\n    {\n        \"eight\": \"REPLACE_ME\"\n    },\n    {\n        \"nine\": \"REPLACE_ME\"\n    }\n]",
+    "expected_output": "{\n    \"one\": \"NEW VALUE\",\n    \"two\": \"`replace_me`.u\",\n    \"three\": \"replace_me.u\",\n    \"four\": \"NEW VALUE\",\n    \"five\": \"`new value`.u\",\n    \"six\": \"NEW VALUE_added\",\n    \"seven\": \"replace_me.u\",\n    \"eight\": \"REPLACE_ME\",\n    \"nine\": \"REPLACE_ME\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2789,7 +2789,7 @@
   {
     "id": "293",
     "input": "key=\"string including ` a single grave\"",
-    "expected_output": "{\n  \"key\": \"string including ` a single grave\"\n}",
+    "expected_output": "{\n    \"key\": \"string including ` a single grave\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2799,7 +2799,7 @@
   {
     "id": "294",
     "input": "key=\"string including some `graved text` here\"",
-    "expected_output": "{\n  \"key\": \"string including some `graved text` here\"\n}",
+    "expected_output": "{\n    \"key\": \"string including some `graved text` here\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2809,7 +2809,7 @@
   {
     "id": "295",
     "input": "key=`string including \" a quote`",
-    "expected_output": "{\n  \"key\": \"string including \\\" a quote\"\n}",
+    "expected_output": "{\n    \"key\": \"string including \\\" a quote\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2819,7 +2819,7 @@
   {
     "id": "296",
     "input": "key=`a string including a quote from Winston: \"We'll fight them on the beaches\"`",
-    "expected_output": "{\n  \"key\": \"a string including a quote from Winston: \\\"We'll fight them on the beaches\\\"\"\n}",
+    "expected_output": "{\n    \"key\": \"a string including a quote from Winston: \\\"We'll fight them on the beaches\\\"\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2829,7 +2829,7 @@
   {
     "id": "297",
     "input": "key=lots of `graved` text is in `this` value",
-    "expected_output": "{\n  \"key\": \"lots of `graved` text is in `this` value\"\n}",
+    "expected_output": "{\n    \"key\": \"lots of `graved` text is in `this` value\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2839,7 +2839,7 @@
   {
     "id": "298",
     "input": "key=`this `could` be `a` controversial `test` because `the` grammar `splits` this `string` in `a` different `way``",
-    "expected_output": "{\n  \"key\": \"this `could` be `a` controversial `test` because `the` grammar `splits` this `string` in `a` different `way`\"\n}",
+    "expected_output": "{\n    \"key\": \"this `could` be `a` controversial `test` because `the` grammar `splits` this `string` in `a` different `way`\"\n}",
     "tested_features": [
       "quotes",
       "graves"
@@ -2849,7 +2849,7 @@
   {
     "id": "299",
     "input": "_test=abc;\nkey=%test.u",
-    "expected_output": "{\n  \"key\": \"ABC\"\n}",
+    "expected_output": "{\n    \"key\": \"ABC\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2858,7 +2858,7 @@
   {
     "id": "300",
     "input": "_test=replace the word this in this string;\ntesting=%test.replace<`this`,`that`>",
-    "expected_output": "{\n  \"testing\": \"replace the word that in that string\"\n}",
+    "expected_output": "{\n    \"testing\": \"replace the word that in that string\"\n}",
     "tested_features": [
       "methods",
       "object_ref",
@@ -2869,7 +2869,7 @@
   {
     "id": "301",
     "input": "_test=replace the word this in this string;\ntesting=%test.replace<this,``>",
-    "expected_output": "{\n  \"testing\": \"replace the word  in  string\"\n}",
+    "expected_output": "{\n    \"testing\": \"replace the word  in  string\"\n}",
     "tested_features": [
       "methods",
       "object_ref",
@@ -2880,7 +2880,7 @@
   {
     "id": "302",
     "input": "key=%`this`.replace<is,at>",
-    "expected_output": "{\n  \"key\" : \"that\"\n}",
+    "expected_output": "{\n    \"key\": \"that\"\n}",
     "tested_features": [
       "methods",
       "object_ref",
@@ -2891,7 +2891,7 @@
   {
     "id": "303",
     "input": "key=`this \"is\" a \"string\" with \"lots\" of \"quoted\" strings`",
-    "expected_output": "{\n  \"key\": \"this \\\"is\\\" a \\\"string\\\" with \\\"lots\\\" of \\\"quoted\\\" strings\"\n}",
+    "expected_output": "{\n    \"key\": \"this \\\"is\\\" a \\\"string\\\" with \\\"lots\\\" of \\\"quoted\\\" strings\"\n}",
     "tested_features": [
       "graves",
       "quotes"
@@ -2901,7 +2901,7 @@
   {
     "id": "304",
     "input": "_vat=20;\nkey=vat rate is %vat%%",
-    "expected_output": "{\n  \"key\": \"vat rate is 20%\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20%\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2910,7 +2910,7 @@
   {
     "id": "305",
     "input": "_vat=20;\nkey=vat rate is %vat%",
-    "expected_output": "{\n  \"key\": \"vat rate is 20\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2919,7 +2919,7 @@
   {
     "id": "306",
     "input": "_vat=20;\nkey=vat rate is %vat%%",
-    "expected_output": "{\n  \"key\": \"vat rate is 20%\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20%\"\n}",
     "tested_features": [
       "object_ref",
       "escapes"
@@ -2938,7 +2938,7 @@
   {
     "id": "308",
     "input": "_vat=20;\nkey=vat rate is %vat %",
-    "expected_output": "{\n  \"key\": \"vat rate is 20 %\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20 %\"\n}",
     "tested_features": [
       "object_ref"
     ],
@@ -2947,7 +2947,7 @@
   {
     "id": "309",
     "input": "_vat=20;\nkey=`vat rate is %vat%%`",
-    "expected_output": "{\n  \"key\": \"vat rate is 20%\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20%\"\n}",
     "tested_features": [
       "object_ref",
       "graves"
@@ -2957,7 +2957,7 @@
   {
     "id": "310",
     "input": "_vat=20;\nkey=\"vat rate is %vat%%\"",
-    "expected_output": "{\n  \"key\": \"vat rate is 20%\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20%\"\n}",
     "tested_features": [
       "object_ref",
       "quotes"
@@ -2967,7 +2967,7 @@
   {
     "id": "311",
     "input": "_vat=20;\nkey=\"vat rate is %vat%`%`\"",
-    "expected_output": "{\n  \"key\": \"vat rate is 20`%`\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20`%`\"\n}",
     "tested_features": [
       "objetct_ref",
       "graves"
@@ -2977,11 +2977,21 @@
   {
     "id": "312",
     "input": "_vat=20;\nkey=\"vat rate is %vat`%`\"",
-    "expected_output": "{\n  \"key\": \"vat rate is 20`%`\"\n}",
+    "expected_output": "{\n    \"key\": \"vat rate is 20`%`\"\n}",
     "tested_features": [
       "object_ref",
       "graves"
     ],
     "minimised_modl": "_vat=20;key=\"vat rate is %vat`%`\""
+  },
+  {
+    "id": "313",
+    "input": "_test1=e1afmkfd;\nrussian1=%test1.p;\n\n_test2=\"e1afmkfd\";\nrussian2=%test2.p;\n\n_test3=`e1afmkfd`;\nrussian3=%test3.p;",
+    "expected_output": "{\n    \"russian1\": \"пример\",\n    \"russian2\": \"пример\",\n    \"russian3\": \"пример\"\n}",
+    "tested_features": [
+      "punycode",
+      "methods"
+    ],
+    "minimised_modl": "_test1=e1afmkfd;russian1=%test1.p;_test2=\"e1afmkfd\";russian2=%test2.p;_test3=`e1afmkfd`;russian3=%test3.p;"
   }
 ]

data/lib/modl/parser/class_processor.rb

@@ -164,6 +164,8 @@ module MODL
         elsif tc == 'num'
           if (v.is_a? String) && (v.to_i.to_s == v.to_s)
             new_value = v.to_i
+          elsif (v.is_a? String) && (v.to_f.to_s == v.to_s)
+            new_value = v.to_f
           elsif v.is_a? TrueClass
             new_value = 1
           elsif v.is_a? FalseClass

data/lib/modl/parser/file_importer.rb

@@ -71,7 +71,11 @@ module MODL
                 txt = File.readlines(file_name).join
               end
             rescue StandardError => e
-              raise InterpreterError, 'File not found: ' + file_name + ', error: ' + e.message
+              # Force load from the cache if possible
+              parsed = @cache.force_get(file_name)
+              if parsed.nil?
+                raise InterpreterError, 'File not found: ' + file_name + ', error: ' + e.message
+              end
             end
             global.loaded_file(file_name)
 

data/lib/modl/parser/interpreter.rb

@@ -27,6 +27,7 @@ require 'modl/parser/MODLParserVisitor'
 require 'modl/parser/MODLLexer'
 require 'modl/parser/MODLParser'
 require 'modl/parser/class_processor'
+require 'modl/parser/orphan_handler'
 require 'modl/parser/parser'
 require 'json'
 
@@ -59,6 +60,9 @@ module MODL
     # Parse the MODL string into a MODL::Parser::Parsed object.
     parsed = MODL::Parser::Parser.parse(string)
 
+    # Check for orphan pairs and adopt them.
+    parsed.structures = MODL::Parser::OrphanHandler.adopt(parsed.global, parsed.structures)
+
     # Convert the Parsed object into a simpler structure of and Array or Hash
     interpreted = parsed.extract_hash
 

data/lib/modl/parser/object_cache.rb

@@ -70,6 +70,17 @@ module MODL
         return if entry.expired?
 
         # Otherwise return the cached object.
+        # We don't delete the cached entry because we might need to force its use if its expired and offline
+        entry.object
+      end
+
+      # If the file is offline this can be used to retrieve the cached version if we have one.
+      def force_get(key)
+        # Return nothing if not in the cache or it has expired.
+        return if key.nil?
+
+        entry = @cache[key]
+        return unless entry
         entry.object
       end
     end

data/lib/modl/parser/orphan_handler.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2019 NUM Technology Ltd
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+module MODL
+  module Parser
+    class OrphanHandler
+      #
+      # Return true if all strings start with '_'
+      #
+      def self.all_hidden(str_array)
+        if str_array && str_array.length > 0
+          str_array.each do |s|
+            return false unless s.start_with?('_')
+          end
+        end
+        true
+      end
+
+      #
+      # Look for any orphan pairs at the top level and adopt them into a map
+      # Its an error if there are duplicate keys or mixed types at the top.
+      #
+      def self.adopt(global, structures)
+        #
+        # Separate out any top-level pairs into a separate hash, checking for duplicates on the way.
+        #
+        if structures
+          pairs = Hash.new
+
+          # This will replace the existing structures array
+          new_structures = []
+
+          structures.each do |s|
+            if s.pair
+              # skip hidden pairs and instructions
+              if s.pair.key.start_with?('*') || s.pair.key.start_with?('_') || s.pair.key == '?'
+                new_structures.push(s)
+                next
+              end
+
+              if pairs.has_key?(s.pair.key)
+                # TODO: raise an exception
+                puts 'Duplicate top level key.'
+              else
+                pairs[s.pair.key] = s
+              end
+            else
+              if pairs.length > 0 && !all_hidden(pairs.keys)
+                # TODO: raise an exception
+                puts 'Mixed top-level types.'
+              else
+                new_structures.push(s)
+              end
+            end
+          end
+
+          if pairs.length > 0
+            #
+            # Create a map for the pairs and insert them into it.
+            #
+            new_map = MODL::Parser::Parsed::ParsedMap.new(global)
+            pairs.values.each do |p|
+              new_map.mapItems.push p unless p.pair.key.start_with?('_')
+            end
+
+            # Add the map to a new structure and insert it at the front of the structures list
+            new_struct = MODL::Parser::Parsed::ParsedStructure.new(global)
+            new_struct.map = new_map
+            new_structures.unshift(new_struct)
+
+            # Replace the existing structures with the new structures.
+            return new_structures
+          end
+        end
+        structures
+      end
+    end
+  end
+end

data/lib/modl/parser/parsed.rb

@@ -64,7 +64,7 @@ module MODL
           @structures << structure
         end
 
-        @structures = global.structures + structures
+        @structures = @global.structures + @structures
 
         @global
       end
@@ -1041,6 +1041,7 @@ module MODL
                 end
               end
             end
+            item.structures = OrphanHandler.adopt(@global, item.structures)
             return item.extract_hash
           end
           return unless @topLevelConditionalReturns.length > @conditionTests.length

data/lib/modl/parser/ref_processor.rb

@@ -162,7 +162,7 @@ module MODL
                          prop = result.find_property(p)
                          if result.text && !prop
                            if StandardMethods.valid_method?(p)
-                             StandardMethods.run_method(p, result.text)
+                             StandardMethods.run_method(p, Sutil.unquote(result.text))
                            else
                              mthd = global.user_method(p)
                              if !mthd.nil?

data/lib/modl/parser/version.rb

@@ -24,6 +24,6 @@
 
 module MODL
   module Parser
-    VERSION = "0.3.11"
+    VERSION = "0.3.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr4-runtime
@@ -138,6 +138,7 @@ files:
 - lib/modl/parser/modl_keylist.rb
 - lib/modl/parser/modl_method.rb
 - lib/modl/parser/object_cache.rb
+- lib/modl/parser/orphan_handler.rb
 - lib/modl/parser/parsed.rb
 - lib/modl/parser/parser.rb
 - lib/modl/parser/ref_processor.rb