cannonbol 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f21caaed4e70356c5f043a524241bf103d8eddd8
-  data.tar.gz: 4ce959eb2fa8b569860d59bbb3de119b2b5c11ae
+  metadata.gz: a648c8cfd875765efac54d699ee04acbbcd7f422
+  data.tar.gz: 47910f41c8d1cfb8953247fa8b788a09ce7d20fd
 SHA512:
-  metadata.gz: 98cf5aa3d8ea84c36503b5cfde8d22f833957ac44c650bf0629bf8ca44b672cc56d66408e0ce732ebc83c6ee3d71923a7497ca7c2cecd70fa8e37e149db0f5b4
-  data.tar.gz: 0ac7d0acbb284131ab62eca5456ad3152877949c51282cf40cc11a896fb1e752028bc1f66f036e0e4157e35a4afca933c936c3846212c2d3cb175c7bf4b494a8
+  metadata.gz: 7dea1273241b4517b6542de8f557f2401fcd6880330d5662edc533428e3878fc15680bfb8a5ae0537c21cfa2a7a62a85dc12e080a74922e8fdbd5a053492d66d
+  data.tar.gz: 14bd53603b2c261ea45cc25f9593fc38c7437aa040eef859651e0b428e40525761b5842237996818f27fecf2d6e45db599fc1dfd5711daa2e216cc0704a57540

data/README.md

@@ -4,11 +4,11 @@ CannonBol is a ruby DSL for patten matching based on SNOBOL4 and SPITBOL.
 
 * Makes complex patterns easier to read and write!
 * Combine regexes, plain strings and powerful new primitive match functions!
-* Makes capturing match results easy!
+* Makes capturing match results simple!
 * Allows recursive patterns!
 * Complete SNOBOL4 + SPITBOL extensions!
 * Based on the well documented, proven SNOBOL4 language!
-* Simple syntax looks great alongside ruby!
+* Simple syntax looks great within your ruby code!
 
 ## Installation
 
@@ -30,7 +30,7 @@ Or install it yourself as:
 
 ### Basic Matching `- &, |, capture?, match_any, match_all`
 
-Strings, Regexes and primitives are combined using & (concatenation) and | (alternation) operators
+Strings, Regexes and primitives are combined using & (concatenation) and | (alternation) operators.  Once the gem is installed you are good to go.
 
 Here is a simple pattern that matches a simple noun clause:
 

data/lib/cannonbol/version.rb

@@ -1,3 +1,3 @@
 module Cannonbol
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/cannonbol.rb

@@ -1,5 +1,3 @@
-require "cannonbol/version"
-
 module Cannonbol
   
   class MatchFailed < Exception; end
@@ -19,10 +17,10 @@ module Cannonbol
     end 
     
     def replace_match_with(s)
-      @cannonbol_string.dup.tap do |new_s| 
-        new_s[@match_start..@match_end] = "" if @match_end >= 0
-        new_s.insert(@match_start, s)
-      end 
+      before_match = ""
+      before_match = @cannonbol_string[0..@match_start-1] if @match_start > 0
+      after_match = @cannonbol_string[@match_end+1..-1] || ""
+      before_match + s + after_match
     end
     
   end
@@ -54,7 +52,7 @@ module Cannonbol
           @success_blocks = []
           @ignore_case = ignore_case
           match = pattern._match?(self)
-          break if anchor and !match 
+          break if !match and anchor  
         end
       rescue MatchFailed
       end
@@ -130,14 +128,10 @@ module Cannonbol
     
   end
    
-  class Pattern < Array
+  class Pattern 
     
     include Operators
     
-    def to_s
-      "#{self.class.name}[#{self.collect(&:to_s).join(', ')}]"
-    end
-    
     def __match?(needle)
       []
     end
@@ -147,16 +141,17 @@ module Cannonbol
   class Choose < Pattern
     
     def __match?(needle, i = 0, s = [])
-      while i < self.length
-        s = self[i]._match?(needle, *s)
+      while i < @params.length
+        s = @params[i]._match?(needle, *s)
         return [i, s] if s
         s = []
         i += 1
       end
+      nil
     end
     
     def initialize(p1, p2)
-      self << p1 << p2
+      @params = [p1, p2]
     end
     
   end
@@ -164,15 +159,15 @@ module Cannonbol
   class Concat < Pattern
     
     def __match?(needle, i = 0, s = [])
-      while i < self.length and i >= 0
-        s[i] = self[i]._match?(needle, *(s[i] || []))
+      while i < @params.length and i >= 0
+        s[i] = @params[i]._match?(needle, *(s[i] || []))
         i = s[i] ? i+1 : i-1
       end
-      [i-1, s] if i == self.length
+      [i-1, s] if i == @params.length
     end
     
     def initialize(p1, p2)
-      self << p1 << p2
+      @params = [p1, p2]
     end
     
   end
@@ -311,7 +306,6 @@ module Cannonbol
         @initial_param_value = opts
       end
       @block = block
-      self << @param << @block
     end
     
     def self.parameter(name, &post_processor)
@@ -568,7 +562,15 @@ class Regexp
   include Cannonbol::Operators
   
   def __match?(needle, thread_state = nil)
-    @cannonbol_regex ||= Regexp.new("^#{self.source}", self.options | (needle.ignore_case ? Regexp::IGNORECASE : 0) )
+    if defined? Opal
+      options = ""
+      options += "m" if `#{self}.multiline`
+      options += "g" if `#{self}.global`
+      options += "i" if needle.ignore_case or `#{self}.ignoreCase`
+    else
+      options = self.options | (needle.ignore_case ? Regexp::IGNORECASE : 0)
+    end
+    @cannonbol_regex ||= Regexp.new("^#{self.source}", options )
     if thread_state
       needle.pull(thread_state)
     elsif m = @cannonbol_regex.match(needle.remaining_string)
@@ -578,6 +580,18 @@ class Regexp
   
 end
 
+if defined? Opal
+  
+  class Proc
+    
+    def parameters
+      /.*function[^(]*\(([^)]*)\)/.match(`#{self}.toString()`)[1].split(",").collect { |param| [:req, param.strip.to_sym]}
+    end
+    
+  end 
+  
+end
+
 module Enumerable
   
   def match_any

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cannonbol
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - catmando
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler