zenml 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc8d8a0fee635054ffabb1fc90ba5b8ed78e6225f7932e2aa777a79274a5d502
-  data.tar.gz: 37c86142fdae037d59d5a27b661fdd5c0689a9bd8a652b910bdc30e82e2d63f0
+  metadata.gz: eeb3297631724f74bcfbcea67c59f71f4131a6d142f3b98c86cbb0836368d1ad
+  data.tar.gz: '029b4e2b8eadea4a68b23b721d46ed3546d25269fb927ddd729781f7a67ae02f'
 SHA512:
-  metadata.gz: ecc6096ee7aca2992e8e3eb2f9d8d6dd703bca5d00a53c8d5b1eba2ccf256ac466c41ee97a795eb4afea9d55bdb576cc5d0133314e788a3ed8cf0d82aa8ea69b
-  data.tar.gz: e9aa413207a31753012f8e814fc63ac7ec7d7fdd4ea4a57312d2b4698d221fd3e0377556902367328dc4dd64ee4495d59461bcc01ebd077a8062cec90e80b120
+  metadata.gz: 3ccb7bae3fc78b5361aa8f951eaca5f34bcd0c3a96fcf59a63a87931fdbdccdd784ed7174deaa3db2f87aa917383ed8f056150f342813eb1e1b5950ce4bde91e
+  data.tar.gz: d725803a7cd455c0a6e2fa1bdabe0ffb37c3e37620252703dda7261fa8c58652f3e67cbb2a75b00ec00d113f90e1d8b73a456cb9d18dd0a3f7658e7dd033006a

data/source/zenml.rb

@@ -3,7 +3,7 @@
 
 module Zenithal
 
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
   VERSION_ARRAY = VERSION.split(/\./).map(&:to_i)
 
 end

data/source/zenml/parser.rb

@@ -14,12 +14,13 @@ module Zenithal::ZenithalParserMethod
   STRING_END = "\""
   CONTENT_START = "<"
   CONTENT_END = ">"
+  CONTENT_DELIMITER = ";"
   SPECIAL_ELEMENT_STARTS = {:brace => "{", :bracket => "[", :slash => "/"}
   SPECIAL_ELEMENT_ENDS = {:brace => "}", :bracket => "]", :slash => "/"}
   COMMENT_DELIMITER = "#"
   SYSTEM_INSTRUCTION_NAME = "zml"
   MARK_CHARS = {:instruction => "?", :trim => "*", :verbal => "~", :multiple => "+"}
-  ESCAPE_CHARS = ["&", "<", ">", "'", "\"", "{", "}", "[", "]", "/", "\\", "|", "`", "#"]
+  ESCAPE_CHARS = ["&", "<", ">", "'", "\"", "{", "}", "[", "]", "/", "\\", "|", "`", "#", ";"]
   SPACE_CHARS = [0x20, 0x9, 0xD, 0xA]
   VALID_FIRST_IDENTIFIER_CHARS = [
     0x3A, 0x5F,
@@ -39,10 +40,9 @@ module Zenithal::ZenithalParserMethod
     0x3001..0xD7FF, 0xF900..0xFDCF, 0xFDF0..0xFFFD, 0x10000..0xEFFFF
   ]
 
+  private
+
   def parse
-    unless @inside_run
-      warn("This method is now only for internal use. Use 'run' instead.", uplevel: 1)
-    end
     if @whole
       parse_document
     else
@@ -50,10 +50,9 @@ module Zenithal::ZenithalParserMethod
     end
   end
 
-  private
-
   def parse_document
     document = REXML::Document.new
+    check_version
     children = parse_nodes({})
     if @exact
       parse_eof 
@@ -67,7 +66,7 @@ module Zenithal::ZenithalParserMethod
   def parse_nodes(options)
     nodes = nil
     if options[:plugin]
-      nodes = options[:plugin].parse
+      nodes = options[:plugin].send(:parse)
     elsif options[:verbal]
       raw_nodes = many(->{parse_text(options)})
       nodes = raw_nodes.inject(REXML::Nodes[], :<<)
@@ -94,17 +93,13 @@ module Zenithal::ZenithalParserMethod
   end
 
   def parse_element(options)
-    start_char = parse_char_any([ELEMENT_START, MACRO_START])
-    name = parse_identifier(options)
-    marks = parse_marks(options)
-    attributes = maybe(->{parse_attributes(options)}) || {}
-    macro = start_char == MACRO_START
+    name, marks, attributes, macro = parse_tag(options)
     next_options = determine_options(name, marks, attributes, macro, options)
     children_list = parse_children_list(next_options)
     if name == SYSTEM_INSTRUCTION_NAME
       parse_space
     end
-    if start_char == MACRO_START
+    if macro
       element = process_macro(name, marks, attributes, children_list, options)
     else
       element = create_element(name, marks, attributes, children_list, options)
@@ -126,6 +121,15 @@ module Zenithal::ZenithalParserMethod
     return element
   end
 
+  def parse_tag(options)
+    start_char = parse_char_any([ELEMENT_START, MACRO_START])
+    name = parse_identifier(options)
+    marks = parse_marks(options)
+    attributes = maybe(->{parse_attributes(options)}) || {}
+    macro = start_char == MACRO_START
+    return name, marks, attributes, macro
+  end
+
   def parse_marks(options)
     marks = many(->{parse_mark(options)})
     return marks
@@ -188,9 +192,28 @@ module Zenithal::ZenithalParserMethod
   end
 
   def parse_children_list(options)
-    first_children = choose(->{parse_empty_children(options)}, ->{parse_children(options)})
-    rest_children_list = many(->{parse_children(options)})
-    children_list = [first_children] + rest_children_list
+    if @version == "1.0"
+      children_list = parse_children_chain(options)
+    else
+      children_list = choose(->{parse_empty_children_chain(options)}, ->{parse_children_chain(options)})
+    end
+    return children_list
+  end
+
+  def parse_children_chain(options)
+    if @version == "1.0"
+      first_children = choose(->{parse_empty_children(options)}, ->{parse_children(options)})
+      rest_children_list = many(->{parse_children(options)})
+      children_list = [first_children] + rest_children_list
+    else
+      children_list = many(->{parse_children(options)})
+    end
+    return children_list
+  end
+
+  def parse_empty_children_chain(options)
+    children = parse_empty_children(options)
+    children_list = [children]
     return children_list
   end
 
@@ -202,8 +225,13 @@ module Zenithal::ZenithalParserMethod
   end
 
   def parse_empty_children(options)
-    parse_char(CONTENT_END)
-    children = REXML::Nodes[]
+    if @version == "1.0"
+      parse_char(CONTENT_END)
+      children = REXML::Nodes[]
+    else
+      parse_char(CONTENT_DELIMITER)
+      children = REXML::Nodes[]
+    end
     return children
   end
 
@@ -217,6 +245,9 @@ module Zenithal::ZenithalParserMethod
     out_chars = [ESCAPE_START, CONTENT_END]
     unless options[:verbal]
       out_chars.push(ELEMENT_START, MACRO_START, CONTENT_START, COMMENT_DELIMITER)
+      if @version == "1.1"
+        out_chars.push(CONTENT_DELIMITER)
+      end
       @special_element_names.each do |kind, name|
         out_chars.push(SPECIAL_ELEMENT_STARTS[kind], SPECIAL_ELEMENT_ENDS[kind])
       end
@@ -255,7 +286,9 @@ module Zenithal::ZenithalParserMethod
     parse_char(CONTENT_START)
     content = parse_block_comment_content(options)
     parse_char(CONTENT_END)
-    parse_char(COMMENT_DELIMITER)
+    if @version == "1.0"
+      parse_char(COMMENT_DELIMITER)
+    end
     comment = create_comment(:block, content, options)
     return comment
   end
@@ -316,12 +349,12 @@ module Zenithal::ZenithalParserMethod
     end
     if marks.include?(:instruction)
       unless children_list.size <= 1
-        throw_custom(error_message("Processing instruction cannot have more than one argument"))
+        throw_custom("Processing instruction cannot have more than one argument")
       end
       nodes = create_instruction(name, attributes, children_list.first, options)
     else
       unless marks.include?(:multiple) || children_list.size <= 1
-        throw_custom(error_message("Normal element cannot have more than one argument"))
+        throw_custom("Normal element cannot have more than one argument")
       end
       nodes = create_normal_element(name, attributes, children_list, options)
     end
@@ -376,7 +409,7 @@ module Zenithal::ZenithalParserMethod
     if name
       nodes = create_element(name, [], {}, [children], options)
     else
-      throw_custom(error_message("No name specified for #{kind} elements"))
+      throw_custom("No name specified for #{kind} elements")
     end
     return nodes
   end
@@ -393,7 +426,7 @@ module Zenithal::ZenithalParserMethod
 
   def create_escape(place, char, options)
     unless ESCAPE_CHARS.include?(char)
-      throw_custom(error_message("Invalid escape"))
+      throw_custom("Invalid escape")
     end
     return char
   end
@@ -408,11 +441,18 @@ module Zenithal::ZenithalParserMethod
     elsif @plugins.key?(name)
       elements = children_list.first
     else
-      throw_custom(error_message("No such macro '#{name}'"))
+      throw_custom("No such macro '#{name}'")
     end
     return elements
   end
 
+  def check_version
+    string = @source.string
+    if match = string.match(/\\zml\?\s*\|.*version\s*=\s*"(\d+\.\d+)".*\|/)
+      @version = match[1]
+    end
+  end
+
 end
 
 
@@ -425,9 +465,11 @@ class Zenithal::ZenithalParser < Zenithal::Parser
 
   def initialize(source)
     super(source)
-    @version = nil
     @exact = true
     @whole = true
+    @fallback_version = "1.0"
+    @version = "1.0"
+    @fallback_special_element_names = {:brace => nil, :bracket => nil, :slash => nil}
     @special_element_names = {:brace => nil, :bracket => nil, :slash => nil}
     @macros = {}
     @plugins = {}
@@ -435,7 +477,8 @@ class Zenithal::ZenithalParser < Zenithal::Parser
 
   def update(source)
     super(source)
-    @version = nil
+    @version = @fallback_version
+    @special_element_names = @fallback_special_element_names
   end
 
   # Registers a macro.
@@ -463,15 +506,23 @@ class Zenithal::ZenithalParser < Zenithal::Parser
     @plugins.delete(name)
   end
 
+  def version=(version)
+    @version = version
+    @fallback_version = version
+  end
+
   def brace_name=(name)
+    @fallback_special_element_names[:brace] = name
     @special_element_names[:brace] = name
   end
 
   def bracket_name=(name)
+    @fallback_special_element_names[:bracket] = name
     @special_element_names[:bracket] = name
   end
 
   def slash_name=(name)
+    @fallback_special_element_names[:slash] = name
     @special_element_names[:slash] = name
   end
 

data/source/zenml/parser_utility.rb

@@ -16,7 +16,6 @@ class Zenithal::Parser
     else
       @source = Zenithal::StringReader.new(source.to_s)
     end
-    @inside_run = false
   end
 
   def update(source)
@@ -28,18 +27,12 @@ class Zenithal::Parser
     else
       @source = Zenithal::StringReader.new(source.to_s)
     end
-    @inside_run = false
   end
 
   def run
     value = nil
     message = catch(ERROR_TAG) do
-      begin
-        @inside_run = true
-        value = parse
-      ensure
-        @inside_run = false
-      end
+      value = parse
     end
     unless value
       raise Zenithal::ZenithalParseError.new(message)
@@ -47,6 +40,8 @@ class Zenithal::Parser
     return value
   end
 
+  private
+
   # Parses a whole data.
   # This method is intended to be overridden in subclasses.
   def parse
@@ -54,8 +49,6 @@ class Zenithal::Parser
     return nil
   end
 
-  private
-
   # Parses a single character which matches the specified query.
   # If the next character does not match the query or the end of file is reached, then an error occurs and no input is consumed.
   # Otherwise, a string which consists of the matched single chracter is returned.
@@ -82,10 +75,10 @@ class Zenithal::Parser
         message = ""
       end
       unless predicate
-        throw_custom(error_message(message))
+        throw_custom(message)
       end
     else
-      throw_custom(error_message("Unexpected end of file"))
+      throw_custom("Unexpected end of file")
     end
     char = @source.read
     return char
@@ -109,10 +102,10 @@ class Zenithal::Parser
     if char
       if chars.any?{|s| s == char}
         chars_string = chars.map{|s| "'#{s}'"}.join(", ")
-        throw_custom(error_message("Expected other than #{chars_string} but got '#{char}'"))
+        throw_custom("Expected other than #{chars_string} but got '#{char}'")
       end
     else
-      throw_custom(error_message("Unexpected end of file"))
+      throw_custom("Unexpected end of file")
     end
     char = @source.read
     return char
@@ -121,7 +114,7 @@ class Zenithal::Parser
   def parse_eof
     char = @source.peek
     if char
-      throw_custom(error_message("Document ends before reaching end of file"))
+      throw_custom("Document ends before reaching end of file")
     end
     char = @source.read
     return true
@@ -129,7 +122,7 @@ class Zenithal::Parser
 
   # Parses nothing; thus an error always occur.
   def parse_none
-    throw_custom(error_message("This cannot happen"))
+    throw_custom("This cannot happen")
     return nil
   end
 
@@ -144,7 +137,7 @@ class Zenithal::Parser
     end
     unless value
       @source.reset(mark)
-      throw_custom(message)
+      throw_custom(message, true)
     end
     return value
   end
@@ -165,7 +158,7 @@ class Zenithal::Parser
       end
     end
     unless value
-      throw_custom(message)
+      throw_custom(message, true)
     end
     return value
   end
@@ -190,13 +183,13 @@ class Zenithal::Parser
         end
       else
         if mark != @source.mark
-          throw_custom(message)
+          throw_custom(message, true)
         end
         break
       end
     end
     unless count >= lower_limit
-      throw_custom(message)
+      throw_custom(message, true)
     end
     return values
   end
@@ -214,7 +207,10 @@ class Zenithal::Parser
 
   # Raises a parse error.
   # Do not use the standard exception mechanism during parsing, and always use this method to avoid creating an unnecessary stacktrace.
-  def throw_custom(message)
+  def throw_custom(message, raw = false)
+    unless raw
+      message = error_message(message)
+    end
     throw(ERROR_TAG, message)
   end
 

data/source/zenml/reader.rb

@@ -3,11 +3,13 @@
 
 class Zenithal::StringReader
 
+  attr_reader :string
   attr_reader :lineno
   attr_reader :columnno
 
   def initialize(string)
-    @string = string.chars
+    @string = string
+    @chars = string.chars
     @pos = -1
     @lineno = 1
     @columnno = 1
@@ -16,7 +18,7 @@ class Zenithal::StringReader
   def read
     @pos += 1
     @columnno += 1
-    char = @string[@pos]
+    char = @chars[@pos]
     if char == "\n"
       @lineno += 1
       @columnno = 1
@@ -25,7 +27,7 @@ class Zenithal::StringReader
   end
 
   def peek
-    char = @string[@pos + 1]
+    char = @chars[@pos + 1]
     return char
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenml
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Ziphil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   This gem serves a tool for parsing a document written in ZenML, an alternative new syntax for XML, to an XML node tree.