SweetTea 0.0.5 → 0.0.6

data/.gitignore

@@ -1,4 +1,3 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# Change Log
+
+### Release 0.0.6 - 6th April 2012
+* 1 Major Feature
+  * Added executable to compile javascript
+* 2 Minor Features
+  * Classes can now be initialised, with arguments
+  * Now developed using TDD
+* 1 Bug Fix
+  * Empty variable would equal 'nil' instead of the correct 'null'
+
+### Release 0.0.5 - 2nd April 2012
+* Initial Public Release
+* 4 Major Features
+  * Classes
+  * Functions
+  * Variables
+  * Strings

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    SweetTea (0.0.5.dev)
+      clamp (~> 0.3.1)
+      treetop
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ZenTest (4.7.0)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    autotest-fsevent (0.2.8)
+      sys-uname
+    clamp (0.3.1)
+    diff-lcs (1.1.3)
+    ffi (1.0.11)
+    notifier (0.1.4)
+    polyglot (0.3.3)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    sys-uname (0.9.0)
+      ffi (>= 1.0.0)
+    test_notifier (1.0.0)
+      notifier
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  SweetTea!
+  autotest
+  autotest-fsevent
+  rspec
+  test_notifier

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2012 James Birtles
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,134 @@
+# SweetTea
+SweetTea is a language that compiles down to javascript, similar to coffeescript.
+
+## Syntax
+### Classes
+##### Empty Class
+```javascript
+// SweetTea
+class-> MyClass
+<-class
+
+// JavaScript
+var MyClass = (function() {
+  function MyClass() {}
+  return MyClass;
+})();
+```
+
+##### Class Init
+```javascript
+// SweetTea
+class-> MyClass
+  function-> init arg1 arg2
+    var-> someVar = "value"
+  <-function
+<-class
+
+// JavaScript
+var MyClass = (function() {
+  function MyClass(arg1, arg2) {
+    var someVar = "value";
+  }
+  return MyClass;
+})();
+```
+
+##### Class Variables
+```javascript
+// SweeTea
+class-> MyClass
+  variable-> myVar = "Hello World"
+<-class
+
+// JavaScript
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myVar = "Hello World";
+  return MyClass;
+})();
+
+```
+
+##### Class Functions
+```javascript
+// SweetTea
+class-> MyClass
+  function-> myFunction <-function
+<-class
+
+// JavaScript
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myFunction = function() {
+  };
+  return MyClass;
+})();
+```
+
+### Functions
+##### Empty Function
+```javascript
+// SweetTea
+function-> myFunc <-function
+
+// JavaScript
+var myFunc = function() {
+};
+```
+
+##### Function with arguments
+```javascript
+// SweetTea
+function-> myFunc arg1 arg2 arg3 <-function
+
+// JavaScript
+var myFunc = function(arg1, arg2, arg3) {
+};
+```
+
+### Variables
+##### Empty Variable
+```javascript
+// SweetTea
+var-> myVar
+
+// JavasScript
+var myVar = null;
+```
+
+##### Variable with value
+```javascript
+// SweetTea
+var-> myVar = "Hello"
+
+// JavaScript
+var myVar = "Hello";
+```
+
+### Data Types
+```javascript
+// Strings
+"I am a String"
+```
+_**Note**: Strings are currently the only data type_
+
+## Aliases
+```javascript
+// Classes
+class->
+c->
+
+// Functions
+function->
+func->
+f->
+
+// Variables
+variable->
+var->
+v->
+```
+
+## License
+All code in this project is licensed under MIT which can be found in the LICENSE file or at this url http://www.opensource.org/licenses/MIT

data/SweetTea.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://jamesbirtles.org/sweettea"
   s.summary     = %q{A language that compiles down to pure javascript}
   s.description = %q{SweetTea is a new language that can be compiled into javascript.}
+  s.license     = "MIT"
 
   s.rubyforge_project = "SweetTea"
 
@@ -23,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "autotest-fsevent"
   s.add_development_dependency "test_notifier"
   s.add_runtime_dependency "treetop"
+  s.add_runtime_dependency "clamp", "~> 0.3.1"
 end

data/bin/tea

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.expand_path("#{File.dirname(__FILE__)}/../lib"))
+
+require "clamp"
+
+class CompileCommand < Clamp::Command
+  option ["-o", "--output"], "OUTPUT", "What to call the file with the compiled javascript"
+  
+  parameter "INPUT", "SweetTea file to compile to javascript", :attribute_name => :filepath
+  
+  def default_output
+    dir = File.expand_path(File.dirname(filepath))
+    name = File.basename(filepath).split(".")
+    name[name.count-1] = "js"
+    "#{dir}/#{name.join(".")}"
+  end
+  
+  def execute
+    require "SweetTea/parser"
+    parser = SweetTea::Parser.new
+    js = parser.parse File.read(File.expand_path(filepath))
+    File.open(output, 'w') {|f| f.write js }
+  end
+end
+
+CompileCommand.run

data/lib/SweetTea/parser.rb

@@ -8,8 +8,14 @@ module SweetTea
     def parse code
       parser = SweetTeaParser.new
       results = parser.parse code
-      @indent = 0
-      @currentClass = nil
+      @options = {
+        :indent => 0,
+        :current_class => nil,
+        :init => {
+          :args => nil,
+          :content => nil
+        }
+      }
       to_js(results)
     end
     
@@ -21,8 +27,8 @@ module SweetTea
           return all.join
         when "SweetTea::ClassNode"
           className = node.elements[2].text_value
-          @currentClass = className
-          @indent += 1
+          @options[:current_class] = className
+          @options[:indent] += 1
           lines = ""
           node.elements[3].elements.each do |n|
             val = to_js(n, true)
@@ -30,10 +36,14 @@ module SweetTea
               lines << "#{val}"
             end
           end
-          @indent -= 1
-          @currentClass = nil
+          @options[:indent] -= 1
+          @options[:current_class] = nil
+          init = @options[:init][:content]
+          init_args = @options[:init][:args]
+          @options[:init][:content] = nil
+          @options[:init][:args] = nil
           return  "#{ind}var #{className} = (function() {\n" +
-                  "#{ind}  function #{className}() {}\n" +
+                  "#{ind}  function #{className}(#{init_args}) {#{init}}\n" +
                   "#{lines}" +
                   "#{ind}  return #{className};\n" +
                   "#{ind}})();\n"
@@ -51,18 +61,24 @@ module SweetTea
             end
           end
           lines = ""
-          @indent += 1
+          @options[:indent] += 1
           node.elements[4].elements.each do |n|
             val = to_js(n)
             if val != ""
               lines << val
             end
           end
-          @indent -= 1
+          @options[:indent] -= 1
           if inClass
-            return  "#{ind}#{@currentClass}.prototype.#{funcName} = function(#{args}) {\n" +
-                    "#{lines}" +
-                    "#{ind}};\n"
+            if funcName == "init"
+              @options[:init][:content] = "\n#{lines}#{ind}" if lines != ""
+              @options[:init][:args] = args
+              return ""
+            else
+              return  "#{ind}#{@options[:current_class]}.prototype.#{funcName} = function(#{args}) {\n" +
+                      "#{lines}" +
+                      "#{ind}};\n"
+            end
           else
             return  "#{ind}var #{funcName} = function(#{args}) {\n" +
                     "#{lines}" +
@@ -71,12 +87,12 @@ module SweetTea
         when "SweetTea::VariableNode"
           varName = node.elements[2].text_value
           if node.elements[4].elements.nil?
-            varValue = "nil"
+            varValue = "null"
           else
             varValue = to_js(node.elements[4].elements[2])
           end
           if inClass
-            return "#{ind}#{@currentClass}.prototype.#{varName} = #{varValue};\n"
+            return "#{ind}#{@options[:current_class]}.prototype.#{varName} = #{varValue};\n"
           else
             return "#{ind}var #{varName} = #{varValue};\n"
           end
@@ -89,7 +105,7 @@ module SweetTea
     end
     
     def ind
-      "  " * @indent
+      "  " * @options[:indent]
     end
   end
 end

data/lib/SweetTea/version.rb

@@ -1,3 +1,3 @@
 module SweetTea
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/expected_js/class_empty.js

@@ -0,0 +1,6 @@
+class-> MyClass <-class
+----
+var MyClass = (function() {
+  function MyClass() {}
+  return MyClass;
+})();

data/spec/expected_js/class_init.js

@@ -0,0 +1,12 @@
+class-> MyClass
+  function-> init
+    var-> someVar = "value"
+  <-function
+<-class
+----
+var MyClass = (function() {
+  function MyClass() {
+    var someVar = "value";
+  }
+  return MyClass;
+})();

data/spec/expected_js/class_init_args.js

@@ -0,0 +1,8 @@
+class-> MyClass
+  function-> init arg1 arg2 arg3 <-function
+<-class
+----
+var MyClass = (function() {
+  function MyClass(arg1, arg2, arg3) {}
+  return MyClass;
+})();

data/spec/expected_js/func_args.js

@@ -0,0 +1,4 @@
+function-> myFunc arg1 arg2 arg3 <-function
+----
+var myFunc = function(arg1, arg2, arg3) {
+};

data/spec/expected_js/func_class.js

@@ -0,0 +1,11 @@
+class-> MyClass
+  function-> myFunction
+  <-function
+<-class
+----
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myFunction = function() {
+  };
+  return MyClass;
+})();

data/spec/expected_js/func_empty.js

@@ -0,0 +1,4 @@
+function-> myFunc <-function
+----
+var myFunc = function() {
+};

data/spec/expected_js/func_gen_correct_type.js

@@ -0,0 +1,14 @@
+class-> MyClass
+  function-> myFunction
+    function-> doSomething <-function
+  <-function
+<-class
+----
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myFunction = function() {
+    var doSomething = function() {
+    };
+  };
+  return MyClass;
+})();

data/spec/expected_js/var_class.js

@@ -0,0 +1,9 @@
+class-> MyClass
+  var-> myVar = "Hello"
+<-class
+----
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myVar = "Hello";
+  return MyClass;
+})();

data/spec/expected_js/var_empty.js

@@ -0,0 +1,3 @@
+var-> myVar
+----
+var myVar = null;

data/spec/expected_js/var_gen_correct_type.js

@@ -0,0 +1,13 @@
+class-> MyClass
+  function-> myFunction
+    var-> myVar = "Hello"
+  <-function
+<-class
+----
+var MyClass = (function() {
+  function MyClass() {}
+  MyClass.prototype.myFunction = function() {
+    var myVar = "Hello";
+  };
+  return MyClass;
+})();

data/spec/expected_js/var_w_value.js

@@ -0,0 +1,3 @@
+var-> myVar = "Hello"
+----
+var myVar = "Hello";

data/spec/grammar_spec.rb

@@ -30,6 +30,10 @@ describe "SweetTea grammer" do
       subject.parse("f-> functionName <-f").should_not be_nil
     end
     
+    it "should allow arguments" do
+      subject.parse("f-> functionName arg1 arg2 arg3 <-function").should_not be_nil
+    end
+    
     it "should allow content" do
       subject.parse(
         <<-CODE

data/spec/parser_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper.rb"
+require "SweetTea/parser"
+base_path = File.expand_path(File.dirname(__FILE__))
+
+code = { stea: {}, js: {} }
+Dir["#{base_path}/expected_js/*.js"].each do |path|
+  contents = File.read(path).split("\n----\n")
+  refName = File.basename(path, ".js").to_sym
+  code[:stea][refName] = contents[0]
+  code[:js][refName] = contents[1]
+end
+
+describe "SweetTea parser" do
+  subject { SweetTea::Parser.new }
+  context "class" do
+    it "should generate the correct javascript for an empty class" do
+      subject.parse(code[:stea][:class_empty]).should == code[:js][:class_empty]
+    end
+    
+    it "should transfer content of 'init' function to class constructor" do
+      subject.parse(code[:stea][:class_init]).should == code[:js][:class_init]
+    end
+    
+    it "should transfer the args of 'init' function to class constructor" do
+      subject.parse(code[:stea][:class_init_args]).should == code[:js][:class_init_args]
+    end
+  end
+  
+  context "function" do
+    it "should generate the correct javascript for an empty function" do
+      subject.parse(code[:stea][:func_empty]).should == code[:js][:func_empty]
+    end
+    
+    it "should generate the correct javascript for a function with args" do
+      subject.parse(code[:stea][:func_args]).should == code[:js][:func_args]
+    end
+    
+    it "should generate the correct type of function for a class method" do
+      subject.parse(code[:stea][:func_class]).should == code[:js][:func_class]
+    end
+    
+    it "doesn't generate class function within class function" do
+      subject.parse(code[:stea][:func_gen_correct_type]).should == code[:js][:func_gen_correct_type]
+    end
+  end
+  
+  context "variable" do
+    it "should generate the correct javascript for a initialised variable" do
+      subject.parse(code[:stea][:var_w_value]).should == code[:js][:var_w_value]
+    end
+    
+    it "should generate the correct javascript for an empty variable" do
+      subject.parse(code[:stea][:var_empty]).should == code[:js][:var_empty]
+    end
+    
+    it "should generate the correct type of variable for a class method" do
+      subject.parse(code[:stea][:var_class]).should == code[:js][:var_class]
+    end
+    
+    it "doesn't generate class variable within class function" do
+      subject.parse(code[:stea][:var_gen_correct_type]).should == code[:js][:var_gen_correct_type]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SweetTea
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115283002400 !ruby/object:Gem::Requirement
+  requirement: &70333014446300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283002400
+  version_requirements: *70333014446300
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70115283001740 !ruby/object:Gem::Requirement
+  requirement: &70333014445660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283001740
+  version_requirements: *70333014445660
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &70115283001280 !ruby/object:Gem::Requirement
+  requirement: &70333014445020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283001280
+  version_requirements: *70333014445020
 - !ruby/object:Gem::Dependency
   name: test_notifier
-  requirement: &70115283000580 !ruby/object:Gem::Requirement
+  requirement: &70333014444400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115283000580
+  version_requirements: *70333014444400
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &70115282999940 !ruby/object:Gem::Requirement
+  requirement: &70333014443760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,28 +65,58 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115282999940
+  version_requirements: *70333014443760
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: &70333014443020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70333014443020
 description: SweetTea is a new language that can be compiled into javascript.
 email:
 - itsme@jamesbirtles.com
-executables: []
+executables:
+- tea
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
 - Rakefile
 - SweetTea.gemspec
+- bin/tea
 - lib/SweetTea.rb
 - lib/SweetTea/grammar.treetop
 - lib/SweetTea/nodes.rb
 - lib/SweetTea/parser.rb
 - lib/SweetTea/version.rb
+- spec/expected_js/class_empty.js
+- spec/expected_js/class_init.js
+- spec/expected_js/class_init_args.js
+- spec/expected_js/func_args.js
+- spec/expected_js/func_class.js
+- spec/expected_js/func_empty.js
+- spec/expected_js/func_gen_correct_type.js
+- spec/expected_js/var_class.js
+- spec/expected_js/var_empty.js
+- spec/expected_js/var_gen_correct_type.js
+- spec/expected_js/var_w_value.js
 - spec/grammar_spec.rb
+- spec/parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://jamesbirtles.org/sweettea
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -110,6 +140,18 @@ signing_key:
 specification_version: 3
 summary: A language that compiles down to pure javascript
 test_files:
+- spec/expected_js/class_empty.js
+- spec/expected_js/class_init.js
+- spec/expected_js/class_init_args.js
+- spec/expected_js/func_args.js
+- spec/expected_js/func_class.js
+- spec/expected_js/func_empty.js
+- spec/expected_js/func_gen_correct_type.js
+- spec/expected_js/var_class.js
+- spec/expected_js/var_empty.js
+- spec/expected_js/var_gen_correct_type.js
+- spec/expected_js/var_w_value.js
 - spec/grammar_spec.rb
+- spec/parser_spec.rb
 - spec/spec_helper.rb
 has_rdoc: