schizm 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2123141f335e7349ec095d5b078acc21f09ed75
-  data.tar.gz: 7751549bb232c6cd6d9d4e63e5a3fd5d3a659574
+  metadata.gz: 0e2929e0a7f68d25c528e1d9b9d0701a22d58994
+  data.tar.gz: 623845d2684c673a9ccb76d8f81f354ea984e0a2
 SHA512:
-  metadata.gz: a5c82e3b896e625eaf65d54dbef821c192f9bbd742beeb1f2a4d0e73e42a258caf9766ca7c96efb2d3db7dd4f13948c0e85c289a20f8f89c948fb04bd2f79d5c
-  data.tar.gz: a2919358945784a928cc2d48201e23013ae5ce72983a2bf4e644c055dd1d4381db3877707f84c959dae8ae4bfff209766ef82f55ca7759680d927bddc38afff4
+  metadata.gz: 0f7659693638560c2aef258fa915cc76c261c5627c6fc4e26792a8e19e732943e6158b3da6d71d1c85f44a7f0d838e99b240f1cad8076e447093d66841d85190
+  data.tar.gz: ec67ab6941bb54b8294f6a2e2d4f75ec4f489b32c3a452e3892e45c377fac6b651c085db5869e834259362637e9ad74a7641c820981a2fd0754e66606d0e8cea

data/lib/schizm/match.rb

@@ -1,18 +1,18 @@
 # Copyright (c) 2017 M. Grady Saunders
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-# 
+#
 #   1. Redistributions of source code must retain the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer.
-# 
+#
 #   2. Redistributions in binary form must reproduce the above
 #      copyright notice, this list of conditions and the following
 #      disclaimer in the documentation and/or other materials
 #      provided with the distribution.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -33,12 +33,6 @@ module Schizm
   # Source path, extension put in match group 1.
   SOURCE_PATH = /^.*\.(c|cc|cpp|cxx|inl|tcc)$/
 
-  # Single quotes.
-  QUOTE1_STRING = /'((?:[^\\']*(?:\\.)*)*)'/u
-
-  # Double quotes.
-  QUOTE2_STRING = /"((?:[^\\"]*(?:\\.)*)*)"/u
-
   # Space sequence.
   SPACE = /\p{Space}+/u
 
@@ -99,7 +93,7 @@ module Schizm
   # HTML entity.
   HTML_ENTITY = /&(?:\w+|\#\d+|\#x\h+);/
 
-  # HTML special characters. 
+  # HTML special characters.
   HTML_ESCAPE = /[\p{^ASCII}&<>]/u
 
   # Character escape, put in match group 1.
@@ -108,12 +102,12 @@ module Schizm
   # Link definition, content put in match group 1, params put in match group 2.
   LINK_DEF = /^\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
 
-  # Link reference, content put in match group 1, params put in match group 2.
-  LINK_REF_BRACKS = /\[(#{DELIM_BRACKS})\]\[(#{DELIM_BRACKS})\]/um
- 
   # Link reference, content put in match group 1, params put in match group 2.
   LINK_REF_PARENS = /\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/um
 
+  # Link reference, content put in match group 1, params put in match group 2.
+  LINK_REF_BRACKS = /\[(#{DELIM_BRACKS})\](?:\[(#{DELIM_BRACKS})\])?/um
+
   # Image definition, entry put in match group 1, params put in match group 2.
   IMAGE_DEF = /^!\[(#{DELIM_BRACKS})\]:[ ]*(.*)[ ]*\n/u
 
@@ -121,7 +115,7 @@ module Schizm
   IMAGE_REF_PARENS = /!\[(#{DELIM_BRACKS})\]\((#{DELIM_PARENS})\)/u
 
   # Image reference, alt put in match group 1, params put in match group 2.
-  IMAGE_REF_BRACKS = /!\[(#{DELIM_BRACKS})\]\[(#{DELIM_BRACKS})\]/u
+  IMAGE_REF_BRACKS = /!\[(#{DELIM_BRACKS})\](?:\[(#{DELIM_BRACKS})\])?/u
 
   # Center math, content put in match group 1.
   CENTER_MATH = /[$][$]((?:[^\\$]*(?:\\.)*)*)[$][$]/um
@@ -250,6 +244,38 @@ module Schizm
     [/\|==>/u, 10503]       # Right double arrow from bar.
   ]
 
+  CPP_INT_DIGITS_02 = /0[Bb][0-1]+/
+
+  CPP_INT_DIGITS_16 = /0[Xx][0-9A-Fa-f]+/
+
+  CPP_INT_DIGITS_10 = /[1-9][0-9]*|0(?![0-9])/
+
+  CPP_INT_DIGITS_08 = /0[0-7]+/
+
+  CPP_INT_DIGITS = Regexp.union [
+    CPP_INT_DIGITS_02, 
+    CPP_INT_DIGITS_16, 
+    CPP_INT_DIGITS_10, 
+    CPP_INT_DIGITS_08
+  ]
+
+  CPP_INT = /#{CPP_INT_DIGITS}(?:[Uu][Ll]{0,2}|[Ll]{1,2}|_[0-9A-Za-z_]+)?/
+
+  CPP_FLT_DIGITS_10 = /(?:\.[0-9]+|[0-9]+\.[0-9]*|[0-9]+(?=[Ee]))(?:[Ee][+-]?[0-9]+)?/
+
+  CPP_FLT_DIGITS_16 = /(?:0[Xx]1\.[0-9A-Fa-f]+[Pp][+-][0-9]+)/
+
+  CPP_FLT_DIGITS = Regexp.union [
+    CPP_FLT_DIGITS_10, 
+    CPP_FLT_DIGITS_16
+  ]
+
+  CPP_FLT = /#{CPP_FLT_DIGITS}(?:[Ii]?[FfLl]|_[A-Za-z0-9_]+)?/
+
+  CPP_NUMBER = /[+-]?(?:#{CPP_FLT}|#{CPP_INT})/
+
+  CPP_STRING = /(?:u8?|[ULR])?(["'])((?:[^\\\1]*(?:\\.)*)*)\1/u
+
   # Syntax highlighting.
   HIGHLIGHT_CPP = [
     ["hi-comment", /\/\/.*$/u],
@@ -260,9 +286,7 @@ module Schizm
     ["hi-type-spec", /(?:constexpr|const|volatile|static|mutable|thread_local|register|extern|inline|noexcept)\b/u],
     ["hi-flow", /(?:new|delete|do|while|for|if|else|try|throw|catch|switch|case|default|break|continue|goto|return)\b/u],
     ["hi-op", /(?:(?:and|or|xor|not)(?:_eq)?|bitand|bitor|compl|(?:(?:const|dynamic|static|reinterpret)_cast))\b/u],
-    ["hi-value", /(?:true|false|this|nullptr|NULL)\b/u],
-    ["hi-value", /'[^'\\]*(?:\\.[^'\\]*)*'/u], # Single quote
-    ["hi-value", /"[^"\\]*(?:\\.[^"\\]*)*"/u], # Double quote
+    ["hi-value", /(?:true|false|this|nullptr|NULL|#{CPP_NUMBER}|#{CPP_STRING})\b/u],
     ["hi-other", /(?:alignas|alignof|sizeof|decltype|template|typename|typedef|using|concept|requires|operator)\b/u],
     ["hi-other", /(?:namespace|class|struct|enum|public|protected|private|friend|final|virtual|override)\b/u],
     ["hi-ident", /[a-zA-Z]\w*/u],

data/lib/schizm/parse.rb

@@ -141,30 +141,33 @@ module Parse
       when sscan.skip(HTML_ESCAPE) then sscan[0].codepoints[0]
       when sscan.skip(CHAR_ESCAPE) then sscan[0].codepoints[0]
       when sscan.skip(LINK_REF_PARENS)
-        shown = String.new(sscan[1]).unescape("]")
-        param = String.new(sscan[2]).unescape(")")
+        text = String.new(sscan[1]).unescape("]")
+        info = String.new(sscan[2]).unescape(")")
+        sscan2 = StringScanner.new(info)
         attrs = Hash.new
-        sscan2 = StringScanner.new(param)
+        attrs["target"] = "_blank"
         until sscan2.eos?
           case
-          when sscan2.skip(QUOTE1_STRING) then attrs["title"] = String.new(sscan2[1]).unescape("'")
-          when sscan2.skip(QUOTE2_STRING) then attrs["title"] = String.new(sscan2[1]).unescape("\"").gsub(/"/u, "'")
+          when sscan2.skip(/'((?:[^\\']*(?:\\.)*)*)'/u) then attrs["title"] = sscan2[1]
+          when sscan2.skip(/"((?:[^\\"]*(?:\\.)*)*)"/u) then attrs["title"] = sscan2[1]
           when sscan2.skip(/\p{Graph}+/u) then attrs["href"] = sscan2[0]
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
         Markup.new("a")
-        .add_attrs("target" => "_blank")
         .add_attrs(attrs)
-        .add_elems(line_elems(where, shown))
+        .add_elems(line_elems(where, text))
       when sscan.skip(LINK_REF_BRACKS)
-        shown = String.new(sscan[1]).unescape("]")
-        param = String.new(sscan[2]).unescape("]")
+        text =
+        name = String.new(sscan[1]).unescape("]")
+        name = String.new(sscan[2]).unescape("]") if sscan[2]
+        attrs = Hash.new
+        attrs["target"] = "_blank"
+        attrs["title"] = HashAttr.new @@links[where][name], "title"
+        attrs["href"] = HashAttr.new @@links[where][name], "href"
         Markup.new("a")
-        .add_attrs("target" => "_blank")
-        .add_attrs("title" => HashAttr.new(@@links[where][param], "title"))
-        .add_attrs("href" => HashAttr.new(@@links[where][param], "href"))
-        .add_elems(line_elems(where, shown))
+        .add_attrs(attrs)
+        .add_elems(line_elems(where, text))
       when sscan.skip(CENTER_MATH)
         Markup.new("script")
         .add_attrs(CENTER_MATH_ATTRS)
@@ -221,7 +224,6 @@ module Parse
       when sscan.skip(HEADING_ATX)
         type = String.new sscan[1]
         text = String.new sscan[2]
-        slug = text.slugify
         Markup.new(
           case type.size
           when 1 then "h1"
@@ -243,33 +245,34 @@ module Parse
               .add_attrs("class" => "title")
               .add_elems(line_elems(where, text))
       when sscan.skip(LINK_DEF)
-        entry = String.new(sscan[1]).unescape("]")
+        name = String.new(sscan[1]).unescape("]")
         sscan2 = StringScanner.new(sscan[2])
         until sscan2.eos?
           case
-          when sscan2.skip(QUOTE1_STRING) then @@links[where][entry]["title"] = String.new(sscan2[1]).unescape("'")
-          when sscan2.skip(QUOTE2_STRING) then @@links[where][entry]["title"] = String.new(sscan2[1]).unescape("\"").gsub(/"/u, "'")
-          when sscan2.skip(/\p{Graph}+/u) then @@links[where][entry]["href"] = sscan2[0]
+          when sscan2.skip(/'((?:[^\\']*(?:\\.)*)*)'/u) then @@links[where][name]["title"] = sscan2[1]
+          when sscan2.skip(/"((?:[^\\"]*(?:\\.)*)*)"/u) then @@links[where][name]["title"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then @@links[where][name]["href"] = sscan2[0]
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
         nil
       when sscan.skip(IMAGE_DEF)
-        entry = String.new(sscan[1]).unescape("]")
+        name = String.new(sscan[1]).unescape("]")
         sscan2 = StringScanner.new(sscan[2])
         until sscan2.eos?
           case
-          when sscan2.skip(/w=(\d+)/u) then @@images[where][entry]["width"] = sscan2[1]
-          when sscan2.skip(/h=(\d+)/u) then @@images[where][entry]["height"] = sscan2[1]
-          when sscan2.skip(/\p{Graph}+/u) then @@images[where][entry]["src"] = sscan2[0]
+          when sscan2.skip(/w=(\d+)/u) then @@images[where][name]["width"] = sscan2[1]
+          when sscan2.skip(/h=(\d+)/u) then @@images[where][name]["height"] = sscan2[1]
+          when sscan2.skip(/\p{Graph}+/u) then @@images[where][name]["src"] = sscan2[0]
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
       when sscan.skip(/^[ ]{0,3}#{IMAGE_REF_PARENS}$/u)
-        alt = String.new(sscan[1]).unescape("]")
-        param = String.new(sscan[2]).unescape(")")
-        sscan2 = StringScanner.new(param)
+        text = String.new(sscan[1]).unescape("]")
+        info = String.new(sscan[2]).unescape(")")
+        sscan2 = StringScanner.new(info)
         attrs = Hash.new
+        attrs["alt"] = text
         until sscan2.eos?
           case
           when sscan2.skip(/w=(\d+)/u) then attrs["width"] = sscan2[1]
@@ -278,17 +281,17 @@ module Parse
           when sscan2.skip(/\p{Space}+/u) then nil
           end
         end
-        Markup.new("img")
-        .add_attrs("alt" => alt)
-        .add_attrs(attrs)
+        Markup.new("img").add_attrs(attrs)
       when sscan.skip(/^[ ]{0,3}#{IMAGE_REF_BRACKS}$/u)
-        alt = String.new(sscan[1]).unescape("]")
-        entry = String.new(sscan[2]).unescape("]")
-        Markup.new("img")
-        .add_attrs("alt" => alt)
-        .add_attrs("src" => HashAttr.new(@@images[where][entry], "src"))
-        .add_attrs("width" => HashAttr.new(@@images[where][entry], "width"))
-        .add_attrs("height" => HashAttr.new(@@images[where][entry], "height"))
+        text = 
+        name = String.new(sscan[1]).unescape("]")
+        name = String.new(sscan[2]).unescape("]") if sscan[2]
+        attrs = Hash.new
+        attrs["alt"] = text
+        attrs["src"] = HashAttr.new @@images[where][name], "src"
+        attrs["width"] = HashAttr.new @@images[where][name], "width"
+        attrs["height"] = HashAttr.new @@images[where][name], "height"
+        Markup.new("img").add_attrs(attrs)
       when sscan.skip(/^#{CHUNK_LABEL}/u)
         div = nil
         chunk = Chunk.hash[where][String.new(sscan[1]).unescape("]")]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schizm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - M. Grady Saunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2017-12-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mgradysaunders@gmail.com