mochiscript 0.4.0.pre12 → 0.4.0.pre13

data/lib/mochiscript/core.rb

@@ -2,7 +2,6 @@ require 'v8'
 require 'json'
 
 module Mochiscript
-  VERSION = "0.4.0-pre12".sub("-", '.')
   class Context
     def initialize
       @ctx = V8::Context.new 
@@ -18,6 +17,10 @@ module Mochiscript
       @ctx.eval_js("$m.toJSON(#{str.to_json})")
     end
 
+    def pp(str)
+      return @ctx.eval_js("$m.pp(#{str.to_json})")
+    end
+
     def eval_ms(str)
       @ctx.eval_js(parse(str))
     end
@@ -151,6 +154,7 @@ var JS2 = $m;
   $m.Class.extend = function(name, klassDef) {
     var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
     klass.OO  = new OO(klass, this);
+    if (klassDef) klass.name = name;
 
     if (typeof name != 'string') {
       klassDef = name;
@@ -336,8 +340,16 @@ JS2.Class.extend('Tokens', function(KLASS, OO){
   });
 
   OO.addMember("lookback",function (n) {
-    var starting = this.consumed;
-    while (this.orig.charAt(starting).match(/\s/)) starting--;
+    var starting = this.consumed - 1;
+
+    //$m.outs(JSON.stringify(this.orig.substr(starting-10, 10)));
+    //$m.outs(JSON.stringify(this.orig.charAt(starting)));
+    while (this.orig.charAt(starting).match(/\s/)) {
+      //$m.outs("back");
+      starting--;
+    }
+
+    //$m.outs(n + "= " + JSON.stringify(this.orig.substr(starting-n, n)));
     return this.orig.substr(starting-n, n);
   });
 
@@ -371,6 +383,13 @@ $m.toJSON = function (str) {
   return parser.toJSON();
 };
 
+$m.pp = function (str) {
+  var parser = new $c.RootParser();
+  parser.parse(new $c.Tokens(str));
+  return parser.pp();
+};
+
+
 
 JS2.Class.extend('RootParser', function(KLASS, OO){
   OO.addMember("handlers",{});
@@ -399,6 +418,7 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
       var handlerClass = this.getHandler(token) || token[2];
       if (handlerClass) {
         var handler = new $c[handlerClass];
+        handler._TYPE = handlerClass;
         if (handler.parse(tokens) !== false) {
           this.out.push(handler); 
           tokens.lastHandler = handler;
@@ -442,6 +462,32 @@ JS2.Class.extend('RootParser', function(KLASS, OO){
     return JSON.stringify(this.toStruct());
   });
 
+  OO.addMember("pp",function (space) {
+    space = space == null ? "  " : space + "  ";
+
+    var ret = [ space + (this._TYPE || 'NODE') ];
+    var generic = [];
+    for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
+      if (ele.pp) {
+        if (generic.length) {
+          ret.push(space + "  TOKENS:" + JSON.stringify(generic.join('')));
+          generic = [];
+        }
+        ret.push(ele.pp(space));
+      } 
+      
+      else {
+        generic.push(ele);
+      }
+    }
+
+    if (generic.length) {
+      ret.push(space + "  TOKENS:" + JSON.stringify(generic.join('')));
+    }
+
+    return ret.join("\n");
+  });
+
   OO.addMember("toStruct",function () {
     var ret = [];
     for(var _i1=0,_c1=this.out,_l1=_c1.length,ele;(ele=_c1[_i1])||(_i1<_l1);_i1++){
@@ -508,6 +554,8 @@ RootParser.extend('ModuleParser', function(KLASS, OO){
 });
 
 RootParser.extend('CurlyParser', function(KLASS, OO){
+  OO.addMember("_TYPE",'CurlyParser');
+
   OO.addMember("initialize",function (chop) {
     this.chop = chop;
     this.$super();
@@ -789,6 +837,7 @@ RootParser.extend('RegexParser', function(KLASS, OO){
     var back = tokens.lookback(2);
 
     if (back.match(DIVIDE)) {
+      this._TYPE = 'DIVIDE';
       tokens.consume(1);
       this.out.push("/"); 
     } 
@@ -808,6 +857,8 @@ RootParser.extend('RegexParser', function(KLASS, OO){
 });
 
 CurlyParser.extend('ForeachParser', function(KLASS, OO){
+  OO.addMember("_TYPE",'Foreach');
+
   // private closure
 
     var REGEX = Tokens.regex("<FOREACH><LBRACE><VAR> <IDENT>(?:**:**<IDENT>)? in (.*?)**<RBRACE>**{");

data/lib/mochiscript.rb

@@ -1,2 +1,7 @@
+module Mochiscript
+  VERSION = "0.4.0-pre13".sub("-", '.')
+end
+
 require File.dirname(__FILE__) + '/mochiscript/core'
 require File.dirname(__FILE__) + '/mochiscript/rails/engine' if defined?(::Rails)
+

data/vendor/assets/javascripts/mochiscript.js

@@ -117,6 +117,7 @@ window.$m = $m;
   $m.Class.extend = function(name, klassDef) {
     var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
     klass.OO  = new OO(klass, this);
+    if (klassDef) klass.name = name;
 
     if (typeof name != 'string') {
       klassDef = name;

metadata

@@ -1,45 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mochiscript
-version: !ruby/object:Gem::Version
-  version: 0.4.0.pre12
+version: !ruby/object:Gem::Version 
   prerelease: 6
+  version: 0.4.0.pre13
 platform: ruby
-authors:
+authors: 
 - Jeff Su
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-31 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-01 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: therubyracer
-  requirement: &70230521509580 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70230521509580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70230521508960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70230521508960
+  version_requirements: *id002
 description: Javascript Dessert
-email:
+email: 
 - me@jeffsu.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -48,28 +52,32 @@ files:
 - lib/mochiscript/rails/engine.rb
 - mochiscript.gemspec
 - vendor/assets/javascripts/mochiscript.js
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
       version: 1.3.1
 requirements: []
+
 rubyforge_project: mochiscript
-rubygems_version: 1.8.10
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Javascript Dessert
 test_files: []
+