lexeme 0.0.1 → 0.0.2

data/lib/lexeme.rb

@@ -2,19 +2,31 @@ require 'lexeme/rule'
 require 'lexeme/ruleset'
 require 'lexeme/token'
 require 'lexeme/lexeme'
+require 'lexeme/core_extensions'
 
 module Lexeme
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
+  
+  def self.analyze(source = nil)
+    raise RuntimeError, 'Please use #define before calling #analyze.' unless @lexer
+    
+    return @lexer.instance_eval(&Proc.new) if 
+      block_given?
+    
+    return @lexer.analyze(source) unless 
+      source.nil?
 
-  def self.setup
-    @lexer = Lexeme.new unless @lexer
-    yield @lexer if block_given?
+    raise ArgumentError, 'Invalid parameters. Expected string or block.'
+  end
+  
+  def self.define(&block)
+    @lexer = Lexeme.new #unless @lexer
+    @lexer.instance_eval(&block)
+    
+    @lexer
   end
 
-  def self.analyze(source)
-    tokens = @lexer.analyze(source)
-    tokens.each { |t| yield t } if block_given?
-
-    tokens
+  def self.reset!
+    remove_instance_variable(:@lexer) if @lexer
   end
 end

data/lib/lexeme/core_extensions.rb

@@ -0,0 +1,19 @@
+class ::String 
+  def to_tokens
+    content = to_s
+
+    Lexeme.define do
+      token :STOP => /^\.$/
+      token :COMA => /^,$/
+      token :QUES => /^\?$/
+      token :EXCL => /^!$/
+      token :QUOT => /^"$/
+      token :APOS => /^'$/
+      token :WORD => /^[\w\-]+$/
+    end
+    
+    Lexeme.analyze do
+      return from_string content
+    end
+  end
+end

data/lib/lexeme/lexeme.rb

@@ -2,20 +2,39 @@ module Lexeme
   class Lexeme
     attr_accessor :ruleset
 
-    def analyze(source)
+    def from_file(filepath = nil)
       raise ArgumentError, 'Argument 1 must be a String' unless
-        source.instance_of? String
+        filepath.instance_of? String
 
       raise ArgumentError, 'Source not defined' if 
-        source.empty?
+        filepath.empty?
       
       raise RuntimeError, 'Source file not readable' unless 
-        File.exists?(source)
+        File.exists?(filepath)
       
-      content = IO.read(source)
-      tokens  = scan(content)
+            
+      scan IO.read(filepath)
+    end
+
+    def from_string(source)
+      raise ArgumentError, 'Argument 1 must be a String' unless
+        source.instance_of? String
+
+      raise ArgumentError, 'Source not defined' if 
+        source.empty?
       
-      tokens
+      scan source
+    end
+
+    # Used by the Lexeme.define method
+    def token(params)
+      @ruleset ||= Ruleset.new
+
+      name  = params.keys.first   || nil
+      regex = params.values.first || nil 
+      @ruleset.rule(name, regex)
+      
+      @ruleset
     end
 
     private 
@@ -25,9 +44,21 @@ module Lexeme
       current  = ''
       tokens   = []
       line     = 1
+      string_state = false
 
       input.each_char do |c|
         line += 1 if c == "\n"
+        
+        if c == "'" || c == '"'
+          previous << c
+          string_state ^= true
+          next
+        end
+
+        if string_state
+          previous << c
+          next
+        end
 
         if ignorable?(c)
           unless previous.empty?
@@ -62,6 +93,10 @@ module Lexeme
         
         previous = current.clone
       end
+      
+      unless previous.empty?
+        tokens << identify(previous)
+      end
 
       tokens
     end

data/lib/lexeme/rule.rb

@@ -3,8 +3,8 @@ module Lexeme
     attr_reader :name, :regex
 
     def initialize(name, regex)
-      raise ArgumentError, 'name must be a String' unless 
-        name.nil? || name.is_a?(String)
+      raise ArgumentError, 'name must be a String or a Symbol' unless 
+        name.nil? || name.is_a?(String) || name.is_a?(Symbol)
       raise ArgumentError, 'regex must be a Regex' unless 
         regex.is_a? Regexp
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexeme
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies: []
-description: A smiple lexical analyzer written in Ruby
-email: vladimir.ivic@me.com
+description: A simple lexical analyzer written in Ruby
+email: vladimir.ivic@icloud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -22,6 +22,7 @@ files:
 - lib/lexeme/token.rb
 - lib/lexeme/ruleset.rb
 - lib/lexeme/rule.rb
+- lib/lexeme/core_extensions.rb
 homepage: http://rubygems.org/gems/lexeme
 licenses: []
 post_install_message: