walrus 0.1 → 0.2

data/bin/walrus

@@ -1,23 +1,30 @@
 #!/usr/bin/env ruby
-# Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# Copyright 2007-2008 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id: diff.rb 89 2007-02-26 15:35:56Z wincent $
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Walrus
-  
+
   EXIT_LOAD_ERROR     = 1
   EXIT_ARGUMENT_ERROR = 2
   EXIT_OTHER_ERROR    = 3
-  
+  EXIT_UNKNOWN_ERROR  = 4
+
   begin
     require 'walrus/runner'
   rescue LoadError => e
     $stderr.puts <<-HERE
-Error: load error (#{e.to_s})
+:: error: load error (#{e.to_s})
 
 If you are trying to run Walrus but have not yet installed it, it may be that
 Ruby cannot find the Walrus files. You can help Ruby to find the Walrus "lib"
@@ -30,15 +37,23 @@ substituting absolute paths for "lib" and "ext":
     HERE
     exit EXIT_LOAD_ERROR
   end
-  
-  begin  
+
+  begin
     Runner.new.run
+  rescue SystemExit => e
+    # normally raised for "--version" or "--help" switches
+  rescue Interrupt => e
+    $stderr.puts ':: aborting: interrupt'
+    exit EXIT_OTHER_ERROR
   rescue Runner::ArgumentError => e
-    $stderr.puts "Error: #{e.to_s}", "For usage information type: #{$0} --help"
+    $stderr.puts ":: error: #{e.to_s}", "For usage information type: #{$0} --help"
     exit EXIT_ARGUMENT_ERROR
   rescue Runner::Error => e
-    $stderr.puts "Error: #{e.to_s}"
+    $stderr.puts ":: error: #{e.to_s}"
     exit EXIT_OTHER_ERROR
+  rescue Exception => e
+    $stderr.puts ":: error: #{e.to_s}"
+    exit EXIT_UNKNOWN_ERROR
   end
-  
+
 end # module Walrus

data/ext/extconf.rb

@@ -0,0 +1,16 @@
+# Copyright 2007-2010 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'mkmf'
+create_makefile('jindex')

data/ext/{jindex/jindex.c → jindex.c}

@@ -1,22 +1,32 @@
-/* 
-Copyright 2007 Wincent Colaiuta
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-in the accompanying file, "LICENSE.txt", for more details.
-
-$Id$
+/*
+Copyright 2007-2010 Wincent Colaiuta
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <ruby.h>
 
 /*
 
-Common code used by almost identical "jindex" and "jrindex" methods. A C extension is necessary here because with direct access to the rb_backref_get and rb_backref_set API there is no way to propagate $~ back to the caller after invoking the "index" and "rindex" methods. The code is basically equivalent to the following Ruby code:
+Common code used by almost identical "jindex" and "jrindex" methods. A C
+extension is necessary here because with direct access to the rb_backref_get
+and rb_backref_set API there is no way to propagate $~ back to the caller after
+invoking the "index" and "rindex" methods. The code is basically equivalent to
+the following Ruby code:
 
 def index arg1, optional_arg
   index = super                                     # plus code here for deciding whether or not to pass optional argument
-  match = ($~ ? $~.clone : nil)                     
+  match = ($~ ? $~.clone : nil)
   index unpack('C*')[0...index].pack('C*').jlength  # jlength clobbers $~ as a side effect, should consider rewriting it
   $~ = match                                        # in pure Ruby setting $~ here has only a local effect (not seen by caller)
   index
@@ -32,7 +42,7 @@ static VALUE walrus_str_index_common(ID func, int argc, VALUE *argv, VALUE str)
     {
         VALUE packing_format    = rb_str_new2("C*");
         VALUE unpacked          = rb_funcall(str, rb_intern("unpack"), 1, packing_format);              /* unpack('C*') */
-        VALUE range             = rb_funcall(rb_cRange, rb_intern("new"), 3, INT2FIX(0), index, Qtrue);        
+        VALUE range             = rb_funcall(rb_cRange, rb_intern("new"), 3, INT2FIX(0), index, Qtrue);
         VALUE slice             = rb_funcall(unpacked, rb_intern("slice"), 1, range);                   /* [0...idx] */
         VALUE packed            = rb_funcall(slice, rb_intern("pack"), 1, packing_format);              /* pack('C*') */
         jindex                  = rb_funcall(packed, rb_intern("jlength"), 0);                          /* jlength */
@@ -48,7 +58,9 @@ call-seq:
     str.jindex(fixnum [, offset])       -> Fixnum or nil
     str.jindex(regexp [, offset])       -> Fixnum or nil
 
-Multibyte-friendly equivalent of the String#index method. If $KCODE is appropriately set will return an accurate index based on character count rather than byte counts.
+Multibyte-friendly equivalent of the String#index method. If $KCODE is
+appropriately set will return an accurate index based on character count rather
+than byte counts.
 
 */
 static VALUE walrus_str_jindex_m(int argc, VALUE *argv, VALUE str)
@@ -63,7 +75,9 @@ call-seq:
     str.jrindex(fixnum [, offset])      -> Fixnum or nil
     str.jrindex(regexp [, offset])      -> Fixnum or nil
 
-Multibyte-friendly equivalent of the String#rindex method. If $KCODE is appropriately set will return an accurate index based on character count rather than byte counts.
+Multibyte-friendly equivalent of the String#rindex method. If $KCODE is
+appropriately set will return an accurate index based on character count rather
+than byte counts.
 
 */
 static VALUE walrus_str_jrindex_m(int argc, VALUE *argv, VALUE str)
@@ -76,4 +90,3 @@ void Init_jindex()
     rb_define_method(rb_cString, "jindex", walrus_str_jindex_m, -1);
     rb_define_method(rb_cString, "jrindex", walrus_str_jrindex_m, -1);
 }
-

data/lib/walrus/additions/string.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/compile_error.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/compiler.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id: /mirrors/Walrus/trunk/walrus/lib/walrus/compiler.rb 6709 2007-04-10T05:38:46.657919Z wincent  $
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 require 'pathname'
@@ -74,7 +80,7 @@ module Walrus
 
         <<-RETURN
 \#!/usr/bin/env ruby
-\# Generated #{Time.new.to_s} by Walrus version #{VERSION}
+\# Generated by Walrus <http://walrus.wincent.com/>
 
 begin
   require 'rubygems'

data/lib/walrus/contrib/spec/walruscloth_spec.rb

@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id: /mirrors/Walrus/trunk/walrus/lib/walrus/contrib/spec/walruscloth_spec.rb 6702 2007-04-09T15:04:40.448669Z wincent  $
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'spec'

data/lib/walrus/contrib/walruscloth.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 gem 'RedCloth', '= 3.0.4'; require 'redcloth'

data/lib/walrus/diff.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 require 'open3'

data/lib/walrus/document.rb

@@ -1,12 +1,18 @@
 #!/usr/bin/env ruby
 #
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id: /mirrors/Walrus/trunk/walrus/lib/walrus/document.rb 6708 2007-04-10T05:38:35.035099Z wincent  $
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 require 'pathname'

data/lib/walrus/grammar/additions/proc.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/additions/regexp.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/additions/string.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/additions/symbol.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 
@@ -25,6 +31,7 @@ class Symbol
   def build(superclass, *params)    
     
     # first use the continuation trick to find out what grammar (namespace) receiver is being messaged in
+    # Ruby 1.9/2.0 will not support continuations, so may need to come up with an alternative
     continuation  = nil
     value         = callcc { |c| continuation = c }         
     if value == continuation                                # first time that we're here

data/lib/walrus/grammar/and_predicate.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/array_result.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/continuation_wrapper_exception.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/left_recursion_exception.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 

data/lib/walrus/grammar/location_tracking.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id: /mirrors/Walrus/trunk/walrus/lib/walrus/grammar/location_tracking.rb 6704 2007-04-09T18:30:00.421185Z wincent  $
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'
 
@@ -92,10 +98,14 @@ module Walrus
       # Given another object that responds to column_end and line_end, returns true if the receiver is rightmost or equal.
       # If the other object is farther to the right returns false.
       def rightmost?(other)
-        if self.line_end > other.line_end         : true
-        elsif other.line_end > self.line_end      : false
-        elsif self.column_end >= other.column_end : true
-        else                                        false
+        if self.line_end > other.line_end
+          true
+        elsif other.line_end > self.line_end
+          false
+        elsif self.column_end >= other.column_end
+          true
+        else
+          false
         end
       end
       

data/lib/walrus/grammar/match_data_wrapper.rb

@@ -1,10 +1,16 @@
 # Copyright 2007 Wincent Colaiuta
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# in the accompanying file, "LICENSE.txt", for more details.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# $Id$
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'walrus'