modl 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f5ec05e9bac3dceff39c2e38fadd43b6f30295329af83bc641c06d89d5714a
-  data.tar.gz: 4cfff5e76356fa15ab754861976cd353d7a13cb2c00f256b6b37f9298ca9f3f9
+  metadata.gz: a8272c24a2a1e013cfd4eb6e6bdfff61aefe3bc3c14d21c2bb074fa5353fb91f
+  data.tar.gz: d6e20fcb6c8315ef74138022014247b3911f8583e9f50c22b279a96d6395331d
 SHA512:
-  metadata.gz: 3285de14057c2ec9be39e3aad436987ccb6543db419cd8c175c9e520cf306c8ccabd3022caa61e454db6ce8539e55649c79ade9a4b5babc6fa7a74020392ef23
-  data.tar.gz: e84998430ef02bba1882af4e91dc538783b0a59ee1dcb53022c26ddfc79813947546468e0631653551427142e5a72318a200aac0d14c3dbc7644c2954fba5b2e
+  metadata.gz: 933b9a82f45098b11a216bf45d0ed5dae37bfe2bd8ef0b2c84340a9760df8e9b496fca19f0ca5f06b28c28a706f83b9794eb8b0c27c79be08a88ae1e0f1d1450
+  data.tar.gz: 7ec8e041d755fe6db94658144a23b18a1f4485e8a2db61729d68f63758de4d412cfdfffe2161401aadbc58310112b048b847dcd6dfde75e365df7192e2e3ca35

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.3.14
+===
+- MODL Syntax Versioning errors update. GitHub issue #11
+- Support for escpaed % characters - GitHub issue #43
+
 0.3.13
 ===
 - Added missing exceptions for Orphan Pairs

data/grammar_tests/base_tests.json

@@ -2993,5 +2993,23 @@
       "methods"
     ],
     "minimised_modl": "_test1=e1afmkfd;russian1=%test1.p;_test2=\"e1afmkfd\";russian2=%test2.p;_test3=`e1afmkfd`;russian3=%test3.p;"
+  },
+  {
+    "id": "314",
+    "input": "_letters=abc;key=\"~%letters\"",
+    "expected_output": "{\"key\":\"%letters\"}",
+    "tested_features": [
+      "escape"
+    ],
+    "minimised_modl": "_letters=abc;key=\"~%letters\""
+  },
+  {
+    "id": "315",
+    "input": "_letters=abc;key=\"\\%letters\"",
+    "expected_output": "{\"key\":\"%letters\"}",
+    "tested_features": [
+      "escape"
+    ],
+    "minimised_modl": "_letters=abc;key=\"\\%letters\""
   }
 ]

data/lib/modl/parser/parser.rb

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

data/lib/modl/parser/ref_processor.rb

@@ -96,7 +96,7 @@ module MODL
                   end
             new_value = nil
           elsif new_value.is_a?(Parsed::ParsedMapItem)
-            raise InterpreterError, 'Interpreter Error: Found a map when expecting an array'
+            raise InterpreterError, 'Found a map when expecting an array'
           elsif new_value.is_a?(MODL::Parser::MODLParserBaseListener)
             if new_value.text
               str = if ref == str
@@ -142,7 +142,7 @@ module MODL
             result = if n.to_s == p
                        # Numeric ref
                        if !result.nil? && !result.respond_to?(:find_property)
-                         raise InterpreterError, 'Interpreter Error: Invalid object reference: ' + degraved
+                         raise InterpreterError, 'Invalid object reference: ' + degraved
                        end
                        result.nil? ? global.index_value(n, degraved) : result.find_property(n)
                      else
@@ -198,7 +198,7 @@ module MODL
                          nil
                        else
                          if !result.nil? && !result.respond_to?(:find_property)
-                           raise InterpreterError, 'Interpreter Error: Invalid object reference: ' + degraved
+                           raise InterpreterError, 'Invalid object reference: ' + degraved
                          end
                          if result.nil?
                            unless ref.start_with?('%`')

data/lib/modl/parser/substitutions.rb

@@ -28,6 +28,8 @@ module MODL
     class Substitutions
 
       @@subs = [
+          ['~%', '%'],
+          ['\\%', '%'],
           ['~\\', '\\'],
           ['\\\\', '\\'],
           ['~~', '~'],

data/lib/modl/parser/version.rb

@@ -24,6 +24,6 @@
 
 module MODL
   module Parser
-    VERSION = "0.3.13"
+    VERSION = "0.3.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modl
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Tony Walmsley
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: antlr4-runtime