Fixed the multiple parentheseses ((())) problem. Reduces it down to just one set now

Author: et

lib/tcsh2bash/nodes.rb

@@ -2,4 +2,5 @@
 
 require File.dirname(__FILE__) + '/nodes/tcsh'
 require File.dirname(__FILE__) + '/nodes/assignment'
+require File.dirname(__FILE__) + '/nodes/boolean'
 require File.dirname(__FILE__) + '/nodes/operators'

lib/tcsh2bash/nodes/boolean.rb

@@ -0,0 +1,26 @@
+module Tcsh2Bash
+  module Boolean
+
+    def self.bracketize (input)
+      '[ ' + input + ' ]'
+    end
+
+    class ParenBoolExpr < Treetop::Runtime::SyntaxNode
+      def to_bash
+        paren_bool_expr.to_bash
+      end
+    end
+
+    class StringComparison < Treetop::Runtime::SyntaxNode
+      def to_bash
+        Tcsh2Bash::Boolean.bracketize (first.text_value + ' ' + string_oper.text_value + ' ' + second.text_value)
+      end
+    end
+
+    class NumericComparison < Treetop::Runtime::SyntaxNode
+      def to_bash
+        Tcsh2Bash::Boolean.bracketize (first.text_value + ' ' + operator.to_bash + ' ' + second.text_value)
+      end
+    end
+  end
+end

lib/tcsh2bash/parsers/boolean.treetop

@@ -3,44 +3,24 @@ module Tcsh2Bash
     include Symbols
     include Operators
 
+    # @todo - Rule for flag matching (-r some_file.txt)
+    #       - AND and OR
+
     rule paren_bool_expr
-      open_paren space* paren_bool_expr space* close_paren {
-        def to_bash
-          open_paren.to_bash + ' ' + paren_bool_expr.to_bash + ' ' + close_paren.to_bash
-        end
-      }
-      /
-      bool_expr
+      open_paren space* paren_bool_expr space* close_paren <ParenBoolExpr> / bool_expr
     end
 
-    #rule bool_expr
-    #  comparison space* (and_or space* comparison)*
-    #end
-
-    ## @todo - Add rule for flag matching (-r some_file.txt)
-    #rule comparison
-    #  negation? string_comparison / numeric_comparison
-    #end
-
     rule bool_expr
       string_comparison / numeric_comparison
     end
 
     # @todo - Add rule for string regex match (=~ and !~)
     rule string_comparison
-      first:(variable_ref / string) space+ string_oper:('==' / '!=') space+ second:(variable_ref / string) {
-        def to_bash
-          first.text_value + ' ' + string_oper.text_value + ' ' + second.text_value
-        end
-      }
+      first:(variable_ref / string) space+ string_oper:('==' / '!=') space+ second:(variable_ref / string) <StringComparison>
     end
 
     rule numeric_comparison
-      first:(variable_ref / number) space* operator space* second:(variable_ref / number) {
-        def to_bash
-          first.text_value + ' ' + operator.to_bash + ' ' + second.text_value
-        end
-      }
+      first:(variable_ref / number) space* operator space* second:(variable_ref / number) <NumericComparison>
     end
 
     rule and_or

lib/tcsh2bash/parsers/conditional.treetop

@@ -13,9 +13,9 @@ module Tcsh2Bash
     #end
 
     rule if_one_line
-      'if' space* open_paren bool_expr close_paren space* stmt:(assignment / anything) {
+      'if' space* open_paren paren_bool_expr close_paren space* stmt:(assignment / anything) {
         def to_bash
-          "if [ " + bool_expr.to_bash + " ]\nthen\n  " + stmt.to_bash.strip + "\nfi"
+          "if " + paren_bool_expr.to_bash + "\nthen\n  " + stmt.to_bash + "\nfi"
         end
       }
     end

lib/tcsh2bash/parsers/symbols.treetop

@@ -20,19 +20,11 @@ module Tcsh2Bash
     end
 
     rule open_paren
-      '(' {
-        def to_bash
-          '['
-        end
-      }
+      '('
     end
 
     rule close_paren
-      ')' {
-        def to_bash
-          ']'
-        end
-      }
+      ')'
     end
 
     rule quote

spec/parsers/boolean_parser_spec.rb

@@ -6,8 +6,6 @@ module Tcsh2Bash
       @parser = BooleanParser.new
     end
 
-
-
     describe "string comparison" do
       specify { convert_to_bash('("foo" == "foo")').should == '[ "foo" == "foo" ]' }
       specify { convert_to_bash('("foo" != "bar")').should == '[ "foo" != "bar" ]' }
@@ -24,7 +22,7 @@ module Tcsh2Bash
 
     # @todo - Figure out this situation
     describe "multiple parentheses" do
-      specify { convert_to_bash("(((1 == 1)))").should == "[ 1 == 1 ]" }
+      specify { convert_to_bash('((("foo" == "bar")))').should == '[ "foo" == "bar" ]' }
     end
 
 =begin

spec/parsers/tcsh_parser_spec.rb

@@ -7,15 +7,11 @@ module Tcsh2Bash
     end
 
     describe 'one line' do
-      it 'should parse this' do
-        parse('set foo=bar').should_not be_nil
-      end
+      specify { parse('set foo=bar').should_not be_nil }
     end
 
     describe 'two lines' do
-      it 'should parse this' do
-        parse("set foo=bar\nalias hello world").should_not be_nil
-      end
+      specify { parse("set foo=bar\nalias hello world").should_not be_nil }
     end
 
     describe 'bad line' do