lexeme 0.0.3 → 0.0.4

data/lib/lexeme.rb

@@ -6,18 +6,6 @@ require 'lexeme/core_extensions'
 require 'lexeme/version'
 
 module Lexeme
-  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?
-
-    raise ArgumentError, 'Invalid parameters. Expected string or block.'
-  end
-  
   def self.define(&block)
     @lexer = Lexeme.new 
     @lexer.instance_eval(&block)

data/lib/lexeme/core_extensions.rb

@@ -1,19 +1,20 @@
-class ::String 
+class ::String
+  # Will move to tokenize and have #to_tokens obsolete
   def to_tokens
-    content = to_s
-
-    Lexeme.define do
-      token :STOP => /^\.$/
-      token :COMA => /^,$/
-      token :QUES => /^\?$/
-      token :EXCL => /^!$/
-      token :QUOT => /^"$/
-      token :APOS => /^'$/
-      token :WORD => /^[\w\-]+$/
+    @lexer ||= Lexeme.define do 
+      use_language :natural
     end
     
-    Lexeme.analyze do
-      return from_string content
+    string_content = self 
+
+    @lexer.analyze do
+      from_string string_content
     end
+
+    @lexer.tokens
+  end
+
+  def tokenize
+    to_tokens
   end
 end

data/lib/lexeme/languages/natural.rb

@@ -0,0 +1,15 @@
+module Lexeme
+  module Language
+    def self.natural
+      Proc.new do 
+        token :STOP => /^\.$/
+        token :COMA => /^,$/
+        token :QUES => /^\?$/
+        token :EXCL => /^!$/
+        token :QUOT => /^"$/
+        token :APOS => /^'$/
+        token :WORD => /^[\w\-]+$/
+      end
+    end
+  end
+end

data/lib/lexeme/lexeme.rb

@@ -1,6 +1,11 @@
 module Lexeme
   class Lexeme
     attr_accessor :ruleset
+    attr_reader   :tokens
+    
+    def analyze(&block)
+      instance_eval(&block)
+    end
 
     def from_file(filepath = nil)
       raise ArgumentError, 'Argument 1 must be a String' unless
@@ -12,8 +17,7 @@ module Lexeme
       raise RuntimeError, 'Source file not readable' unless 
         File.exists?(filepath)
       
-            
-      scan IO.read(filepath)
+      @tokens = scan(IO.read(filepath))
     end
 
     def from_string(source)
@@ -23,10 +27,9 @@ module Lexeme
       raise ArgumentError, 'Source not defined' if 
         source.empty?
       
-      scan source
+      @tokens = scan(source)
     end
 
-    # Used by the Lexeme.define method
     def token(params)
       @ruleset ||= Ruleset.new
 
@@ -36,6 +39,13 @@ module Lexeme
       
       @ruleset
     end
+    
+    def use_language(name)
+      require "lexeme/languages/#{name}.rb"
+      instance_eval(&Language::send(name))
+    rescue LoadError
+      abort "Language file cannot be found"
+    end
 
     private 
     

data/lib/lexeme/version.rb

@@ -1,3 +1,3 @@
 module Lexeme
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lexeme
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies: []
 description: A simple lexical analyzer written in Ruby
 email: vladimir.ivic@icloud.com
@@ -24,7 +24,8 @@ files:
 - lib/lexeme/rule.rb
 - lib/lexeme/core_extensions.rb
 - lib/lexeme/version.rb
-homepage: http://rubygems.org/gems/lexeme
+- lib/lexeme/languages/natural.rb
+homepage: https://github.com/mancmelou/lexeme
 licenses: []
 post_install_message: 
 rdoc_options: []