oedipus_lex 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae00ca9bebb1e13070e5b9ee44b4cfa762333cce
-  data.tar.gz: 5b798da04b678300ed976de7a281fcbb6d39a979
+  metadata.gz: 16d5bf4e2e41af8957fcfee63012c44ee33f65df
+  data.tar.gz: 55ec9b8e51834e8bee5f1ae27d6d4a1276c53094
 SHA512:
-  metadata.gz: 86902463f0f518bca1f7a02412a70e9e90aa95cd6be8169a48ed88a11228b520ffb11ea9cccb5e212c8e2fe3183e4a4b54a73c2aabbee8e61ac15147671028ef
-  data.tar.gz: c0b06ce63410490eafdfa2d8ee5758d7e92dd824d444b9e30767ce65e82c5439a04c51e4959bc97d5f2b55b80968f3b046320f92c2be9944b7b7444b7c189265
+  metadata.gz: d78c2765d033065c1be87a0a18860bec9d0f7ce359218ad88db34cd5381e70ff34435e489cdcb6fa2a6091b115f16524333dda547fcb712fac36c1192d8b8553
+  data.tar.gz: 62cc88bdb0ee37be1d38aaca8a7ad7979839d6a9602d1797f25361873a40994d394c8d44e0d0fe15d255916cb5e716d829a410161783a8e4283b90a16bb8153b

data/History.rdoc

@@ -1,4 +1,12 @@
-=== 1.0.0 / 2013-12-13
+=== 2.1.0 / 2014-01-22
+
+* 3 minor enhancements:
+
+  * Added lineno and do_parse as options via grammar.
+  * All options are now opt-in. You might want to add do_parse and lineno to your grammar.
+  * New option lineno will turn on automatic line number handling at the top of next_token.
+
+=== 2.0.0 / 2013-12-13
 
 * 1 major enhancement
 

data/README.rdoc

@@ -47,6 +47,8 @@ resource for CS learning. Books... books are good. I like books.
   option_section  = /options?/ NL (option)*
   option          = /stub/i
                   | /debug/i
+                  | /do_parse/i
+                  | /lineno/i
 
   inner_section   = /inner/ NL (misc_line)*
 
@@ -109,7 +111,8 @@ testability.
 
 ==== Options
 
-There are currently only two options for Oedipus: "debug" and "stub".
+All options are opt-in and can be specified either in the grammar or
+via an options hash in `OedipusLex#initialize`.
 
 Specify `debug` to turn on basic tracing output.
 
@@ -118,6 +121,13 @@ specified on the commandline with a rather generic handler. This makes
 it easy to get up and running before you have the rest of your system
 in place.
 
+Specify `do_parse` to generate a generic do_parse method that
+automatically dispatches off to `lex_<token_type>` methods.
+
+Specify `lineno` to generate automatic line number handling at the
+beginning of `next_token`. This was the default in 1.0.0 and you must
+now activate it.
+
 ==== Inner
 
 The inner section is just code, like header or footer, but inner gets

data/lib/oedipus_lex.rb

@@ -4,7 +4,7 @@ require "erb"
 require "oedipus_lex.rex"
 
 class OedipusLex
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 
   attr_accessor :class_name
   attr_accessor :header
@@ -17,7 +17,8 @@ class OedipusLex
 
   DEFAULTS = {
     :debug    => false,
-    :do_parse => true,
+    :do_parse => false,
+    :lineno   => false,
     :stub     => false,
   }
 
@@ -166,7 +167,9 @@ class OedipusLex
 % starts.each do |s|
           <%= s %>
 % end
+% if option[:lineno] then
           self.lineno += 1 if ss.peek(1) == "\n"
+% end
 
           token = nil
 

data/lib/oedipus_lex.rex

@@ -13,6 +13,11 @@
 
 class OedipusLex
 
+option
+
+  do_parse
+  lineno
+
 macro
   ST    /(?:(:\S+|\w+\??))/
   RE    /(\/(?:\\.|[^\/])+\/[ion]?)/
@@ -37,6 +42,8 @@ rule
   :option       /\s+/                   # do nothing
   :option       /stub/i                 { [:option, text] }
   :option       /debug/i                { [:option, text] }
+  :option       /do_parse/i             { [:option, text] }
+  :option       /lineno/i               { [:option, text] }
 
   :inner        /.*/                    { [:inner, text] }
 

data/lib/oedipus_lex.rex.rb

@@ -104,6 +104,10 @@ class OedipusLex
             action { [:option, text] }
           when (state == :option) && (text = ss.scan(/debug/i)) then
             action { [:option, text] }
+          when (state == :option) && (text = ss.scan(/do_parse/i)) then
+            action { [:option, text] }
+          when (state == :option) && (text = ss.scan(/lineno/i)) then
+            action { [:option, text] }
           when (state == :inner) && (text = ss.scan(/.*/)) then
             action { [:inner, text] }
           when (state == :start) && (text = ss.scan(/.*/)) then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oedipus_lex
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   Y4evBVezr3SjXz08vPqRO5YRdO3zfeMT8gBjRqZjWJGMZ2lD4XNfrs7eky74CyZw
   xx3n58i0lQkBE1EpKE0lFu/y
   -----END CERTIFICATE-----
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.8'
 description: |-
   Oedipus Lex is a lexer generator in the same family as Rexical and
   Rex. Oedipus Lex is my independent lexer fork of Rexical. Rexical was
@@ -107,6 +107,7 @@ extra_rdoc_files:
 - sample/error1.txt
 files:
 - .autotest
+- .gemtest
 - History.rdoc
 - Manifest.txt
 - README.rdoc
@@ -133,7 +134,6 @@ files:
 - sample/xhtmlparser.rex
 - sample/xhtmlparser.xhtml
 - test/test_oedipus_lex.rb
-- .gemtest
 homepage: http://github.com/seattlerb/oedipus_lex
 licenses:
 - MIT
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oedipus_lex
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Oedipus Lex is a lexer generator in the same family as Rexical and Rex