phaad 0.0.2 → 0.0.3

data/Guardfile

@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^(lib|spec)/(.+)\.rb$})    { "spec/" }
+end
+

data/lib/phaad/generator.rb

@@ -27,7 +27,7 @@ module Phaad
         should_not_be = [ [:bodystmt, [[:void_stmt]], nil, nil, nil] ]
         first_should_not_be = [:void_stmt, :def, :bodystmt, :if, :else, :elsif,
           :unless, :while, :until, :while_mod, :until_mod, :if_mod, :unless_mod,
-          :massign, :class, :for]
+          :massign, :class, :for, :case, :defs]
         emit ";\n" if !should_not_be.include?(sexp) && !first_should_not_be.include?(sexp.first)
       end
       outdent unless options[:indent] == false
@@ -69,7 +69,10 @@ module Phaad
       when :string_literal
         process(sexp[1])
       when :string_embexpr
+        no_brackets = [:var_ref, :method_add_arg, :command]
+        emit "(" unless no_brackets.include?(sexp[1][0][0])
         process sexp[1][0]
+        emit ")" unless no_brackets.include?(sexp[1][0][0])
       when :regexp_literal
         emit '"/'
         emit sexp[1][0][1]
@@ -79,6 +82,8 @@ module Phaad
         emit sexp[1]
       when :symbol_literal
         emit sexp[1][1][1].inspect
+      when :@label
+        emit sexp[1][0..-2].inspect
       when :dyna_symbol
         process(sexp[1][0])
       when :assign
@@ -102,6 +107,15 @@ module Phaad
           process r
           emit ";\n"
         end
+      when :opassign
+        raise NotImplementedError, sexp.inspect unless sexp[2][0] == :@op
+        process(sexp[1])
+        if sexp[2][1] == "<<="
+          emit " .= "
+        else
+          emit " #{sexp[2][1]} "
+        end
+        process(sexp[3])
       when :return
         emit "return "
         process sexp[1]
@@ -116,13 +130,17 @@ module Phaad
         emit sexp[1][1..-1]
       when :@const
         emit sexp[1]
+      when :break
+        emit "break"
+      when :next
+        emit "continue"
       when :method_add_arg
         if sexp[1][0] == :fcall && sexp[1][1][0] == :@ident
           emit sexp[1][1][1]
           emit "("
           process sexp[2][1] if sexp[2][1]
           emit ")"
-        elsif sexp[1][0] == :call 
+        elsif sexp[1][0] == :call
           process sexp[1]
           emit "("
           process sexp[2][1] if sexp[2][1]
@@ -138,7 +156,7 @@ module Phaad
         process sexp[3]
       when :command
         if sexp[1][0] == :@ident
-          no_brackets = %w{global echo}
+          no_brackets = %w{global echo var public}
           emit sexp[1][1]
           emit no_brackets.include?(sexp[1][1]) ? " " : "("
           if sexp[2][0] == :args_add_block
@@ -156,9 +174,20 @@ module Phaad
           emit ", " unless s == sexp[1].last
         end
       when :call
-        process sexp[1]
-        emit "->"
-        emit sexp[3][1]
+        if sexp[1][1][0] == :@const
+          if sexp[3][1] == "new"
+            emit "new "
+            process sexp[1]
+          else
+            process sexp[1]
+            emit "::"
+            emit sexp[3][1]
+          end
+        else
+          process sexp[1]
+          emit "->"
+          emit sexp[3][1]
+        end
       when :command_call
         if sexp[1][0] == :var_ref && sexp[1][1][0] == :@ident && sexp[2] == :"." && 
           sexp[3][0] == :@ident && sexp[4][0] == :args_add_block
@@ -168,6 +197,19 @@ module Phaad
           emit "("
           process sexp[4]
           emit ")"
+        elsif sexp[1][0] == :var_ref && sexp[1][1][0] == :@const &&
+          sexp[3][0] == :@ident && sexp[4][0] == :args_add_block
+          if sexp[3][1] == "new"
+            emit "new "
+            process sexp[1]
+          else
+            process sexp[1]
+            emit "::"
+            emit sexp[3][1]
+          end
+          emit "("
+          process sexp[4]
+          emit ")"
         else
           raise NotImplementedError, sexp.inspect
         end
@@ -249,6 +291,37 @@ module Phaad
         emit ") {\n"
         process_statements sexp[3]
         emit "}\n"
+      when :case
+        emit "switch("
+        process sexp[1]
+        emit ") {\n"
+        indent
+        # exp stores the next statement.
+        exp = sexp[2]
+        while exp
+          if exp[0] == :when
+            exp[1].each_with_index do |each_case, i|
+              emit "case "
+              process each_case
+              emit ":"
+              emit " " if i < exp[1].size - 1
+            end
+            emit "\n"
+            process_statements exp[2] if exp[2]
+          elsif exp[0] == :else
+            emit "default:"
+            emit "\n"
+            process_statements exp[1] if exp[1]
+          else
+            raise NotImplementedError, sexp.inspect
+          end
+          indent
+          emit "break;\n"
+          outdent
+          exp = exp[3]
+        end
+        outdent
+        emit "}\n"
       when :def
         raise NotImplementedError, sexp.inspect unless sexp[1][0] == :@ident
         emit "function "
@@ -264,6 +337,21 @@ module Phaad
         emit ") {\n"
         process_statements [sexp[3]]
         emit "}\n"
+      when :defs
+        raise NotImplementedError, sexp.inspect unless sexp[3][0] == :@ident
+        emit "static function "
+        emit sexp[3][1]
+        emit "("
+        if sexp[4][0] == :params
+          process sexp[4] # params
+        elsif sexp[4][0] == :paren && sexp[4][1][0] == :params
+          process sexp[4][1]
+        else
+          raise NotImplementedError, sexp.inspect
+        end
+        emit ") {\n"
+        process_statements [sexp[5]]
+        emit "}\n"
       when :class
         if sexp[1][1][0] != :@const || (sexp[2] && sexp[2][1][0] != :@const)
           raise NotImplementedError, sexp.inspect
@@ -295,7 +383,7 @@ module Phaad
             process param[1]
           end
         end
-      when :array, :hash
+      when :array, :hash, :bare_assoc_hash
         emit "array("
         if sexp[1]
           if sexp[1][0] == :assoclist_from_args

data/lib/phaad/version.rb

@@ -1,3 +1,3 @@
 module Phaad
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/phaad.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'slop', '~>1.6.0'
   s.add_dependency 'fssm', '~>0.2.7'
   s.add_development_dependency 'rspec', '~>2.6.0'
+  s.add_development_dependency 'guard-rspec', '~>0.4.3'
+  s.add_development_dependency 'growl_notify', '~>0.0.1' if RUBY_PLATFORM.include?("darwin")
 end

data/spec/generator/array_spec.rb

@@ -24,6 +24,7 @@ describe Phaad::Generator, 'array creation' do
     it "should create simple arrays" do
       compile("{a => :b, 1 => 2, /foo/ => /bar/}").should ==
         'array($a => "b", 1 => 2, "/foo/" => "/bar/");'
+      compile("{a: b, c: 1}").should == 'array("a" => $b, "c" => 1);'
     end
 
     it "should create nested arrays" do

data/spec/generator/binary_spec.rb

@@ -52,4 +52,29 @@ describe Phaad::Generator, "binary" do
   it "should parse << as ." do
     compile("'foo' << 'bar'").should == '"foo" . "bar";'
   end
+
+  context "operator assign" do
+    it "should parse += -= *= /= %=" do
+      compile("a += 1").should == "$a += 1;"
+      compile("a -= 1").should == "$a -= 1;"
+      compile("a *= 1").should == "$a *= 1;"
+      compile("a /= 1").should == "$a /= 1;"
+      compile("a %= 1").should == "$a %= 1;"
+    end
+
+    it "should parse |= &= ^=" do
+      compile("a |= 1").should == "$a |= 1;"
+      compile("a &= 1").should == "$a &= 1;"
+      compile("a ^= 1").should == "$a ^= 1;"
+    end
+
+    it "should parse && ||" do
+      compile("a &&= false").should == "$a &&= FALSE;"
+      compile("a ||= false").should == "$a ||= FALSE;"
+    end
+
+    it "should parse <<= into .=" do
+      compile("a <<= b").should == "$a .= $b;"
+    end
+  end
 end

data/spec/generator/function_spec.rb

@@ -10,28 +10,57 @@ describe Phaad::Generator, 'call a function' do
     compile("a b c d, e, f()").should == "a(b(c($d, $e, f())));"
   end
 
-  it "should not add brackets when calling global and echo" do
+  it "should not add brackets when calling global, echo, var, public" do
     compile("echo a").should == "echo $a;"
     compile("echo a, b").should == "echo $a, $b;"
     compile("global a").should == "global $a;"
     compile("global a, b").should == "global $a, $b;"
+    compile("var a").should == "var $a;"
+    compile("var a, b").should == "var $a, $b;"
+    compile("public a").should == "public $a;"
+    compile("public a, b").should == "public $a, $b;"
+  end
+
+  it "should print new ClassName when ClassName.new is called" do
+    compile("Foo.new").should == "new Foo;"
+    compile("Foo.new a, b, c").should == "new Foo($a, $b, $c);"
+    compile("Foo.new(a, b, c)").should == "new Foo($a, $b, $c);"
+  end
+
+  it "should call using :: when a function is called on a Constant" do
+    compile("Foo.bar()").should == "Foo::bar();"
+    compile("Foo.bar a, b, c").should == "Foo::bar($a, $b, $c);"
+    compile("Foo.bar(a, b, c)").should == "Foo::bar($a, $b, $c);"
+  end
+
+  it "should accept named params and pass it as an array" do
+    compile("Foo.bar :a => 1, 'b' => 2").should == 'Foo::bar(array("a" => 1, "b" => 2));'
   end
 end
 
 describe Phaad::Generator, 'define a function' do
-  it "should define a function without params" do
-    compile("def f\nend").should start_with("function f()")
-  end
+  context "normal function" do
+    it "should define a function without params" do
+      compile("def f\nend").should == "function f() {\n}"
+    end
+
+    it "should define a function with basic params" do
+      compile("def f a\nend").should == "function f($a) {\n}"
+      compile("def f(a)\nend").should == "function f($a) {\n}"
+      compile("def f a, b\nend").should == "function f($a, $b) {\n}"
+      compile("def f(a, b)\nend").should == "function f($a, $b) {\n}"
+    end
 
-  it "should define a function with basic params" do
-    compile("def f a\nend").should start_with("function f($a)")
-    compile("def f(a)\nend").should start_with("function f($a)")
-    compile("def f a, b\nend").should start_with("function f($a, $b)")
-    compile("def f(a, b)\nend").should start_with("function f($a, $b)")
+    it "should define a function with params with default values" do
+      compile("def f a = 4\nend").should == "function f($a = 4) {\n}"
+      compile("def f a, b = 4\nend").should == "function f($a, $b = 4) {\n}"
+    end
   end
 
-  it "should define a function with params with default values" do
-    compile("def f a = 4\nend").should start_with("function f($a = 4)")
-    compile("def f a, b = 4\nend").should start_with("function f($a, $b = 4)")
+  context "static (self) function" do
+    it "should define a function with/without params" do
+      compile("def self.f\nend").should == "static function f() {\n}"
+      compile("def self.f(a, b)\nend").should == "static function f($a, $b) {\n}"
+    end
   end
 end

data/spec/generator/keywords_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Phaad::Generator, 'keywords' do
+  it "should compile break" do
+    compile("break").should == "break;"
+  end
+
+  it "should compile next into continue" do
+    compile("next").should == "continue;"
+  end
+end

data/spec/generator/string_spec.rb

@@ -31,6 +31,11 @@ describe Phaad::Generator, 'string' do
         '"a " . $b . " " . foo("bar", "baz") . " ";'
     end
 
+    it "should add brackets to interpolation except simple variable / function calls" do
+      compile('"a #{b + c} d"').should == '"a " . ($b + $c) . " d";'
+      compile('"a #{b(e) + c} d"').should == '"a " . (b($e) + $c) . " d";'
+    end
+
     it "should handle empty \#{} properly" do
       compile('"a #{b} #{} "').should == '"a " . $b . " " . " ";'
     end

data/spec/generator/switch_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Phaad::Generator, "switch" do
+  it "should parse case statements" do
+    compile("case a\nwhen b\nc\nend").should == "switch($a) {\n  case $b:\n    $c;\n    break;\n}"
+  end
+
+  it "should parse multiple when statements" do
+    compile("case a\nwhen b\nc\nwhen d\ne\nend").should ==
+      "switch($a) {\n  case $b:\n    $c;\n    break;\n  case $d:\n    $e;\n    break;\n}"
+  end
+
+  it "should parse else statement" do
+    compile("case a\nwhen b\nc\nwhen d\ne\nelse\nf\nend").should ==
+      "switch($a) {\n  case $b:\n    $c;\n    break;\n  case $d:\n    $e;\n    break;\n" +
+      "  default:\n    $f;\n    break;\n}"
+  end
+
+  it "should parse multiple case in single when statement" do
+    compile("case a\nwhen b, c, d\ne\nend").should ==
+      "switch($a) {\n  case $b: case $c: case $d:\n    $e;\n    break;\n}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phaad
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-01 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &75976660 !ruby/object:Gem::Requirement
+  requirement: &70365216887360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *75976660
+  version_requirements: *70365216887360
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &76004900 !ruby/object:Gem::Requirement
+  requirement: &70365216886480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *76004900
+  version_requirements: *70365216886480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76018460 !ruby/object:Gem::Requirement
+  requirement: &70365216884980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,29 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76018460
+  version_requirements: *70365216884980
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70365216883640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+  type: :development
+  prerelease: false
+  version_requirements: *70365216883640
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &70365216882460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :development
+  prerelease: false
+  version_requirements: *70365216882460
 description: A beautiful way to write PHP
 email:
 - utkarshkukreti@gmail.com
@@ -55,6 +77,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/phaad
@@ -72,11 +95,13 @@ files:
 - spec/generator/function_spec.rb
 - spec/generator/if_spec.rb
 - spec/generator/ivar_spec.rb
+- spec/generator/keywords_spec.rb
 - spec/generator/literal_spec.rb
 - spec/generator/massign_spec.rb
 - spec/generator/paren_spec.rb
 - spec/generator/return_spec.rb
 - spec/generator/string_spec.rb
+- spec/generator/switch_spec.rb
 - spec/generator/ternary_spec.rb
 - spec/generator/unary_spec.rb
 - spec/generator/while_spec.rb
@@ -103,8 +128,30 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: phaad
-rubygems_version: 1.8.4
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A beautiful way to write PHP
-test_files: []
+test_files:
+- spec/generator/array_spec.rb
+- spec/generator/assign_spec.rb
+- spec/generator/binary_spec.rb
+- spec/generator/class_spec.rb
+- spec/generator/constants_spec.rb
+- spec/generator/for_spec.rb
+- spec/generator/function_spec.rb
+- spec/generator/if_spec.rb
+- spec/generator/ivar_spec.rb
+- spec/generator/keywords_spec.rb
+- spec/generator/literal_spec.rb
+- spec/generator/massign_spec.rb
+- spec/generator/paren_spec.rb
+- spec/generator/return_spec.rb
+- spec/generator/string_spec.rb
+- spec/generator/switch_spec.rb
+- spec/generator/ternary_spec.rb
+- spec/generator/unary_spec.rb
+- spec/generator/while_spec.rb
+- spec/generator/whitespace_spec.rb
+- spec/phaad_spec.rb
+- spec/spec_helper.rb