cycr 0.0.4 → 0.0.5

data/cycr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "cycr"
-  s.version = "0.0.4"
-  s.date = "2010-10-19"
+  s.version = "0.0.5"
+  s.date = "2010-11-23"
   s.summary = "Ruby client for the (Open)Cyc server"
   s.email = "apohllo@o2.pl"
   s.homepage = "http://github.com/apohllo/cycr"

data/lib/cycr/builder.rb

@@ -23,9 +23,9 @@ module Cyc
 
     def method_missing(name,*args,&block)
       @query << "(" << name.to_s.gsub("_","-") << " "
-      @query << args.map{|a| a.to_cyc}.join(" ")
+      @query << (args||[]).map{|a| a.to_cyc}.join(" ")
       if block
-        self.instance_exec(&block)
+        block.call(self)
       end
       @query << ")"
     end

data/lib/cycr/client.rb

@@ -121,7 +121,7 @@ module Cyc
           while current_result.size == 100 do
             send_message("(subseq #{last_message} #{result.size} " +
                          "#{result.size + 100})")
-            current_result = receive_answer(options)
+            current_result = receive_answer(options) || []
             result.concat(current_result)
           end
           result

data/lib/cycr/extensions.rb

@@ -1,24 +1,36 @@
 class String
-  def to_cyc
+  def to_cyc(raw=false)
     "\"#{self}\""
   end
 end
 
 class Symbol
-  def to_cyc
+  def to_cyc(raw=false)
     "#\$#{self}"
   end
 end
 
 class Array
-  def to_cyc
-    "'("+map{|e| e.to_cyc}.join(" ")+")"
+  def to_cyc(raw=false)
+    contents = "'("+map{|e| e.to_cyc(raw)}.join(" ")+")"
+    if raw
+      contents
+    else
+      "(el-find-if-nart #{contents})"
+    end
   end
 end
 
 class Fixnum
-  def to_cyc
+  def to_cyc(raw=false)
     to_s
   end
 end
 
+module Cyc
+  class LiteralString < String
+    def to_cyc(raw=false)
+      self
+    end
+  end
+end

data/lib/cycr/parser.rb

@@ -49,6 +49,8 @@ module Cyc
           top = stack.pop
           stack[-1].push top
           raise ContinueParsing.new(stack[0][0])
+        when :assertion_sep
+          # ignore
         end
       end
       stack[0][0]

data/lib/cycr/sexpr.rex

@@ -7,7 +7,7 @@ macro
   LINE_TERMINATOR       \r|\n|\r\n
   INPUT_CHARACTER       [^\r\n\"\(\):& ]
   WHITE_SPACE           [\ \t\f\r\n] | \r\n
-  SYMBOL                :[^<>\r\n\"\(\):&\ ]+
+  SYMBOL                :[^<>\r\n\"\(\):&\#\ ]+
   CYC_SYMBOL            \#\$[a-zA-Z0-9:_-]+
   ATOM                  [^\r\n\"\(\):&\ ]+
   OPEN_PAR              \(
@@ -17,6 +17,7 @@ macro
   OPEN_LIST_QUOTE       \#<
   CLOSE_LIST_QUOTE      >
   DOT                   \.
+  ASSERTION_SEP         :
 
 
 rule
@@ -35,6 +36,7 @@ rule
                         {ATOM}			      { [:atom,text] }
                         # literals 
                         {QUOTE}           { state = :STRING; @str = ""; [:in_string] }
+                        {ASSERTION_SEP}  { [:assertion_sep]}
                         # whitespace 
                         {WHITE_SPACE}     # ignore 
   :STRING               [^\n\r\"\\]+      { @str << text; [:in_string]}

data/lib/cycr/sexpr.rex.rb

@@ -73,7 +73,7 @@ class SExpressionLexer
         when (text = ss.scan(/NIL/))
            @rex_tokens.push action { [:nil,text] }
 
-        when (text = ss.scan(/:[^<>\r\n\"\(\):&\ ]+/))
+        when (text = ss.scan(/:[^<>\r\n\"\(\):&\#\ ]+/))
            @rex_tokens.push action { [:symbol,text] }
 
         when (text = ss.scan(/\#\$[a-zA-Z0-9:_-]+/))
@@ -85,6 +85,9 @@ class SExpressionLexer
         when (text = ss.scan(/\"/))
            @rex_tokens.push action { state = :STRING; @str = ""; [:in_string] }
 
+        when (text = ss.scan(/:/))
+           @rex_tokens.push action { [:assertion_sep]}
+
         when (text = ss.scan(/[\ \t\f\r\n]/))
           ;
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cycr
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency