rubylog 2.0.1 → 2.1.0

data/Gemfile

@@ -7,4 +7,6 @@ group :development do
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.8.3"
   gem "simplecov", :require => false
+  gem "guard"
+  gem "guard-rspec"
 end

data/Gemfile.lock

@@ -3,12 +3,19 @@ GEM
   specs:
     diff-lcs (1.2.4)
     git (1.2.5)
+    guard (1.4.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (2.0.0)
+      guard (>= 1.1)
+      rspec (~> 2.11)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     json (1.7.7)
+    listen (0.5.2)
     multi_json (1.7.2)
     rake (10.0.4)
     rdoc (4.0.1)
@@ -26,6 +33,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    thor (0.18.1)
     yard (0.8.6.1)
 
 PLATFORMS
@@ -33,6 +41,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  guard
+  guard-rspec
   jeweler (>= 1.8.3)
   rspec (>= 2.8.0, < 3)
   ruby-prof

data/README.rdoc

@@ -19,7 +19,7 @@ First, install the gem
 
 or, if you use +bundler+, add this line to your +Gemfile+:
 
-  gem 'rubylog', '~>2.0'
+  gem 'rubylog', '~>2.1'
 
 
 === The context

data/RELEASE_NOTES.rdoc

@@ -1,8 +1,11 @@
-== Version 2.1 (planned)
+== Planned features
+* <tt>solve</tt> without a block returns an enumerator
+* warning for singleton variables
+* <tt>nonvar</tt> predicate
+
+== Version 2.1 
 * New features
-  * solve without a block returns an enumerator
-  * warning for singleton variables
-  * predicate for checking bound/unbound variables
+  * Works with Ruby 1.9.3 and 2.0 (only <tt>module X; extend Rubylog::Context</tt> syntax)
 
 == Version 2.0.1
 * Bug fixes

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/{examples → benchmark}/benchmark.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 # benchmark
 #
 # The task is to collect all grandparent-granchild relationships in a family

data/benchmark/benchmark/pure.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+require "rubylog"
+
+module FamilyTree
+  extend Rubylog::Context
+  predicate_for $person_class, ".parent_of() .grandparent_of()"
+
+  def make_tree(parent, levels)
+    return if levels.zero?
+
+    children = (1..DEGREES).map{random_person} 
+
+    children.each do |child|
+      # add relationship
+      parent.parent_of!(child)
+    end
+
+    children.each do |child|
+      # make sub-tree
+      make_tree(child, levels-1)
+    end 
+  end 
+
+  make_tree(random_person, LEVELS)
+
+  A.grandparent_of(B).if A.parent_of(X).and X.parent_of(B)
+
+end

data/bin/rubylog

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require "rubylog"
+require "rubylog/rubylog_files"
+
+if ARGV.empty?
+  filename = '-'
+  source = $stdin.read
+  source = Rubylog::RubylogFiles.convert_source(source)
+  eval(source, TOPLEVEL_BINDING, filename, 1)
+else
+  load_rubylog ARGV.shift
+end
+
+

data/examples/a_plus_b.rb

@@ -1,6 +1,6 @@
-require "rubylog"
-extend Rubylog::Context
+# Read two integers in each line of the input. Write the sum of each pair to the outuput.
 
 "#{A} #{B}".in{$stdin.readlines}.each do
   puts A.to_i + B.to_i
 end
+

data/examples/dcg.rb

@@ -1,36 +1,32 @@
-require "rubylog"
-# This is a quick and dirty solution to replace Prolog's DCG syntax.
+# This is a simple solution to replace Prolog's DCG syntax.
 # It is slow for long inputs. See examples/dcg2.rb for a more efficient algorithm (the same as Prolog's DCG).
 
-rubylog do
-  predicate_for Array, ".sentence", ".subject", ".object", ".nominal_phrase", ".noun", ".verb", ".article"
+predicate_for Array, ".sentence", ".subject", ".object", ".nominal_phrase", ".noun", ".verb", ".article"
 
-  [*S,*V,*O].sentence.if S.subject.and V.verb.and O.object
-  S.subject.if S.nominal_phrase
-  O.object .if O.nominal_phrase
-  [*A,*N].nominal_phrase.if A.article.and N.noun
+[*S,*V,*O].sentence.if S.subject.and V.verb.and O.object
+S.subject.if S.nominal_phrase
+O.object .if O.nominal_phrase
+[*A,*N].nominal_phrase.if A.article.and N.noun
 
-  %w(a).article!
-  %w(the).article!
+%w(a).article!
+%w(the).article!
 
-  %w(dog).noun!
-  %w(cat).noun!
-  %w(mouse).noun!
+%w(dog).noun!
+%w(cat).noun!
+%w(mouse).noun!
 
-  %w(chases).verb!
-  %w(eats).verb!
+%w(chases).verb!
+%w(eats).verb!
 
-  def check_passed goal; end
+def check_passed goal; end
 
-  check %w(dog).noun
-  check %w(a dog).nominal_phrase
-  check %w(dog).nominal_phrase.false
-  check %w(the dog chases a cat).sentence
-  check %w(the dog chases a cat stuff).sentence.false
-  check %w(dog chases cat).sentence.false
-  check { %W(the #{S} chases the #{O}).sentence.map{[S,O]}.count == 9 }
+check %w(dog).noun
+check %w(a dog).nominal_phrase
+check %w(dog).nominal_phrase.false
+check %w(the dog chases a cat).sentence
+check %w(the dog chases a cat stuff).sentence.false
+check %w(dog chases cat).sentence.false
+check { %W(the #{S} chases the #{O}).sentence.map{[S,O]}.count == 9 }
 
-  puts *S.sentence.map{S.join(" ")}
+puts *S.sentence.map{S.join(" ")}
 
-
-end

data/examples/dcg2.rb

@@ -1,42 +1,37 @@
 # This is an example of the same algorithm that Prolog's DCG syntax generates.
 #
 
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require 'rubylog'
 
-rubylog do
-  predicate_for Array, ".sentence()", ".subject()", ".object()", ".nominal_phrase()", ".noun()", ".verb()", ".article()"
+predicate_for Array, ".sentence()", ".subject()", ".object()", ".nominal_phrase()", ".noun()", ".verb()", ".article()"
 
-  # sentence --> subject, verb, object
-  Se.sentence(L3).if Se.subject(L1).and L1.verb(L2).and L2.object(L3)
-  # subject --> nominal_phrase
-  S.subject(L1).if S.nominal_phrase(L1)
-  # object --> nominal_phrase
-  O.object(L1) .if O.nominal_phrase(L1)
-  # nominal_phrase --> article, noun
-  N.nominal_phrase(L2).if N.article(L1).and L1.noun(L2)
+# sentence --> subject, verb, object
+Se.sentence(L3).if Se.subject(L1).and L1.verb(L2).and L2.object(L3)
+# subject --> nominal_phrase
+S.subject(L1).if S.nominal_phrase(L1)
+# object --> nominal_phrase
+O.object(L1) .if O.nominal_phrase(L1)
+# nominal_phrase --> article, noun
+N.nominal_phrase(L2).if N.article(L1).and L1.noun(L2)
 
-  ["a",*L1].article! L1
-  ["the",*L1].article! L1
+["a",*L1].article! L1
+["the",*L1].article! L1
 
-  ["dog",*L1].noun! L1
-  ["cat",*L1].noun! L1
-  ["mouse",*L1].noun! L1
+["dog",*L1].noun! L1
+["cat",*L1].noun! L1
+["mouse",*L1].noun! L1
 
-  ["chases",*L1].verb! L1
-  ["eats",*L1].verb! L1
+["chases",*L1].verb! L1
+["eats",*L1].verb! L1
 
-  def check_passed goal; end
+def check_passed goal; end
 
-  check %w(dog).noun([])
-  check %w(a dog).nominal_phrase([])
-  check %w(dog).nominal_phrase(ANY).false
-  check %w(the dog chases a cat).sentence([])
-  check %w(the dog chases a cat stuff).sentence(["stuff"])
-  check %w(dog chases cat).sentence(ANY).false
-  check { %W(the #{S} chases the #{O}).sentence([]).map{[S,O]}.count == 9 }
+check %w(dog).noun([])
+check %w(a dog).nominal_phrase([])
+check %w(dog).nominal_phrase(ANY).false
+check %w(the dog chases a cat).sentence([])
+check %w(the dog chases a cat stuff).sentence(["stuff"])
+check %w(dog chases cat).sentence(ANY).false
+check { %W(the #{S} chases the #{O}).sentence([]).map{[S,O]}.count == 9 }
 
-  puts *S.sentence([]).map{S.join(" ")}
+puts *S.sentence([]).map{S.join(" ")}
 
-
-end

data/examples/divisors.rb

@@ -1,4 +1,2 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require "rubylog"
-
+# Outputs the number of pairs of divisors of 672
 p rubylog { P.is(672).and A.in{1..P}.and P.product_of(A,B).and{A<=B} }.count

data/examples/factorial.rb

@@ -1,17 +1,10 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require 'rubylog'
-
-rubylog do
-  predicate_for Integer, ".factorial()"
-
-  0.factorial! 1
-  N[thats > 0].factorial(K).if \
-    N.sum_of(N1,1).
-    and N1.factorial(K1).
-    and K.product_of(K1,N)
-
-  7.factorial(N).solve {puts N}
-end
-
+# Factorial
+predicate_for Integer, ".factorial()"
 
+0.factorial! 1
+N[thats > 0].factorial(K).if \
+  N.sum_of(N1,1).
+  and N1.factorial(K1).
+  and K.product_of(K1,N)
 
+7.factorial(N).solve {puts N}

data/examples/file_search.rb

@@ -1,16 +1,17 @@
-require "rubylog"
-extend Rubylog::Context
+# Outputs which source files have and which source files do not have a test.
+#
 
-[true,false].each do |b|
-  puts "Files which #{b ? 'have' : 'do not have'} spec:"
+predicate_for String, ".libfile .specfile"
 
-  "lib/#{X}.rb".file_in("lib/**").each do
-    if b == "spec/#{X}_spec.rb".file_in?("spec/**")
-      puts X
-    end
-  end
-
-  puts
-
-end
+L.libfile.if "lib/#{L}.rb".file_in("lib/**")
+L.specfile.if "spec/#{L}_spec.rb".file_in("spec/**")
 
+puts "Libs which have spec:"
+L.libfile.and(L.specfile).each { puts L }
+puts
+puts "Libs which do not have spec:"
+L.libfile.and(L.specfile.false).each { puts L }
+puts
+puts "Specs which do not have lib:"
+L.specfile.and(L.libfile.false).each { puts L }
+puts

data/examples/hanoi.rb

@@ -1,6 +1,4 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require "rubylog"
-extend Rubylog::Context
+# Hanoi tower solution
 
 predicate_for Integer, ".move(,,)", ".hanoi"
 

data/examples/hu/csaladfa.rb

@@ -1,7 +1,3 @@
-# encoding: UTF-8
-require "rubylog"
-extend Rubylog::Context
-
 predicate_for String, ".parent_of() .grandparent_of()"
 
 # ki kinek a szülője

data/examples/n_queens.rb

@@ -1,32 +1,27 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require "rubylog"
+predicate_for Integer, ".on(,)", ".attacks(,)", ".placed"
+predicate ":arranged"
 
-rubylog do
-  predicate_for Integer, ".on(,)", ".attacks(,)", ".placed"
-  predicate ":arranged"
+N=7
 
-  N=7
+A.attacks(R,ANY_C).if A.on(R,ANY_C)
+A.attacks(ANY_R,C).if A.on(ANY_R,C)
+A.attacks(R2,C2).if A.on(R1,C1).and {R1-C1==R2-C2}
+A.attacks(R2,C2).if A.on(R1,C1).and {R1+C1==R2+C2}
 
-  A.attacks(R,ANY_C).if A.on(R,ANY_C)
-  A.attacks(ANY_R,C).if A.on(ANY_R,C)
-  A.attacks(R2,C2).if A.on(R1,C1).and {R1-C1==R2-C2}
-  A.attacks(R2,C2).if A.on(R1,C1).and {R1+C1==R2+C2}
+A.placed.if \
+  C.in(1..N).and(B.on(ANY,ANY).none(B.attacks(A,C))).and A.on(A,C).assumed
 
-  A.placed.if \
-    C.in(1..N).and(B.on(ANY,ANY).none(B.attacks(A,C))).and A.on(A,C).assumed
+:arranged.if every A.in(1..N), A.placed
 
-  :arranged.if every A.in(1..N), A.placed
-
-  :arranged.solve do
-    L.in(1..N).each do
-      M.in(1..N).each do
-        print ANY.on?(L,M) ? "X" : "."
-      end
-      puts
+:arranged.solve do
+  # draw board
+  L.in(1..N).each do
+    M.in(1..N).each do
+      print ANY.on?(L,M) ? "X" : "."
     end
     puts
   end
-
-
+  puts
 end
 
+

data/examples/palindrome_detection.rb

@@ -1,5 +1,4 @@
-require "rubylog"
-extend Rubylog::Context
+# Palindrome checking with guards
 
 predicate_for String, ".palindrome"
 

data/examples/parsing.rb

@@ -1,29 +1,25 @@
-$:.unshift File.dirname(__FILE__)+"/../lib"
-require "rubylog"
 require "readline"
 
-rubylog do
-  predicate_for String, ".term()", ".expr()", ".atom()"
+predicate_for String, ".term()", ".expr()", ".atom()"
 
-  "#{A}+#{B}".expr(K).if A.expr(I).and B.term(J).and K.is{I+J}
-  "#{A}-#{B}".expr(K).if A.expr(I).and B.term(J).and K.is{I-J}
-  A.expr(K).if A.term(K)
-  "#{A}*#{B}".term(K).if A.atom(I).and B.term(J).and K.is{I*J}
-  "#{A}/#{B}".term(K).if A.atom(I).and B.term(J).and K.is{I/J}
-  A.term(K).if A.atom(K)
-  A[/\A[0-9]+\z/].atom(K).if K.is{A.to_i}
-  "(#{A})".atom(K).if A.expr(K)
+"#{A}+#{B}".expr(K).if A.expr(I).and B.term(J).and K.is{I+J}
+"#{A}-#{B}".expr(K).if A.expr(I).and B.term(J).and K.is{I-J}
+A.expr(K).if A.term(K)
+"#{A}*#{B}".term(K).if A.atom(I).and B.term(J).and K.is{I*J}
+"#{A}/#{B}".term(K).if A.atom(I).and B.term(J).and K.is{I/J}
+A.term(K).if A.atom(K)
+A[/\A[0-9]+\z/].atom(K).if K.is{A.to_i}
+"(#{A})".atom(K).if A.expr(K)
 
-  check "5".expr(5)
-  check "5+3*2".expr(11)
-  check "1+2+3+4".expr(10)
-  check "(5+3)/2".expr(4)
-  check "(5+3(5)/2".expr(ANY).false
-
-  puts
-  while k = Readline.readline("> ", true)
-    k.chomp!
-    puts k.expr(X).map{X}.first || "error"
-  end
+check "5".expr(5)
+check "5+3*2".expr(11)
+check "1+2+3+4".expr(10)
+check "(5+3)/2".expr(4)
+check "(5+3(5)/2".expr(ANY).false
 
+puts
+while k = Readline.readline("> ", true)
+  k.chomp!
+  puts k.expr(X).map{X}.first || "error"
 end
+