Merge pull request #7 from fcard/and-or-spc

coderofsalvation · web-flow · commit 74bd7ad45f19 · 2016-07-12T06:04:11.000+02:00
Fix and/or substitution problem (#6)
diff --git a/lang/bash/.transpile b/lang/bash/.transpile
@@ -78,8 +78,8 @@ transpile_if(){
   code="${1/if not/if \!}"
   firstvar="${code/\! /}"
   firstvar="$(echo "$firstvar" | awk '{ print $2 }')"
-  code="${code//and /&& }"
-  code="${code//or /|| }"
+  code="${code// and / && }"
+  code="${code// or / || }"
   code="${code//> /-gt }"
   code="${code//>= /-ge }"
   code="${code//< /-lt }"
diff --git a/powscript b/powscript
@@ -107,8 +107,8 @@ transpile_if(){
   code="${1/if not/if \!}"
   firstvar="${code/\! /}"
   firstvar="$(echo "$firstvar" | awk '{ print $2 }')"
-  code="${code//and /&& }"
-  code="${code//or /|| }"
+  code="${code// and / && }"
+  code="${code// or / || }"
   code="${code//> /-gt }"
   code="${code//>= /-ge }"
   code="${code//< /-lt }"
diff --git a/test/code-1.pow b/test/code-1.pow
@@ -99,7 +99,7 @@ decorate_string "foo"
 
 usage()
   echo "foo <number>"
-  
+
 switch $1
   case [0-9]*
     echo "arg 1 is a number"
diff --git a/test/if.pow b/test/if.pow
@@ -0,0 +1,5 @@
+if -x $(command -v python)
+  echo "python exists"
+else
+  echo "python doesn't exist"
+
diff --git a/test/testapp.pow b/test/testapp.pow
@@ -1,6 +1,6 @@
 usage(app)
   echo "$app <number>"
-  
+
 switch $1
   case [0-9]*
     echo "arg 1 is a number"
