Add super mammouth

btwael · Aug 25, 2014 · 3df1dda · 3df1dda
1 parent 02605e9
commit 3df1dda
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 22 deletions.
diff --git a/extras/mammouth.js b/extras/mammouth.js
@@ -3876,16 +3876,19 @@ require["./helpers"] = (function() {var exports = {}, module = {exports: exports
 return module.exports;})();
 require["./rewriter"] = (function() {var exports = {}, module = {exports: exports};// Generated by CoffeeScript 1.7.1
 (function() {
-  var helpers, nodes;
+  var SuperMammouth, helpers, nodes;
 
   nodes = require('./nodes');
 
   helpers = require('./helpers');
 
+  SuperMammouth = "\nfunction mammouth($func, $arg1, $arg2){if ( $func == '+' ){if((is_string($arg1) && is_numeric($arg2))||(is_string($arg2) && is_numeric($arg1))) {return $arg1.$arg2;} else {return $arg1+$arg2;}}}\n";
+
   exports.rewrite = function(tree, context) {
-    var ADD, IdCounter, UseSuperMammouth, compile, doc, php, _i, _len;
+    var ADD, AddSuperMammouth, IdCounter, UseSuperMammouth, code, compile, doc, php, _i, _len;
     IdCounter = new helpers.IdCounter;
     UseSuperMammouth = false;
+    AddSuperMammouth = false;
     php = '';
     ADD = function(string) {
       return php += string;
@@ -4065,7 +4068,7 @@ require["./rewriter"] = (function() {var exports = {}, module = {exports: export
             r = compile(element.left) + '.' + compile(element.right);
           } else if (element.operator === '+') {
             UseSuperMammouth = true;
-            r = '$Mammouth("+", ' + compile(element.left) + ', ' + compile(element.right) + ')';
+            r = 'mammouth("+", ' + compile(element.left) + ', ' + compile(element.right) + ')';
           } else {
             r = compile(element.left) + ' ' + element.operator + ' ' + compile(element.right);
           }
@@ -4106,7 +4109,7 @@ require["./rewriter"] = (function() {var exports = {}, module = {exports: export
           r = 'isset(' + compile(element.expression) + ')';
           return r;
         case 'In':
-          r = '$Mammouth("in_array", ' + compile(element.left) + ', ' + compile(element.right) + ')';
+          r = 'mammouth("in_array", ' + compile(element.left) + ', ' + compile(element.right) + ')';
           return r;
         case 'Echo':
           return 'echo ' + compile(element.value);
@@ -4355,7 +4358,13 @@ require["./rewriter"] = (function() {var exports = {}, module = {exports: export
           ADD(doc.toPHP());
           break;
         case 'MammouthBlock':
-          ADD('<?php' + compile(doc.body) + '?>');
+          code = compile(doc.body);
+          if (UseSuperMammouth && !AddSuperMammouth) {
+            code = SuperMammouth + code;
+            AddSuperMammouth = true;
+            UseSuperMammouth = false;
+          }
+          ADD('<?php' + code + '?>');
       }
     }
     return php;

diff --git a/extras/mammouth.min.js b/extras/mammouth.min.js
diff --git a/lib/rewriter.js b/lib/rewriter.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mammouth",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"description": "Unfancy PHP",
 	"author": {
 		"name": "Wael Amine Boutglay",

diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -186,7 +186,7 @@ lexer.addRule RegularExpression.MammouthStart, ->
 
 	lastIsIdentifier = false
 	ShouldCloseCall = false
-	captureTypeCasting  =false
+	captureTypeCasting  = false
 	tokenStack = []
 	return '{{'
 

diff --git a/src/rewriter.coffee b/src/rewriter.coffee
@@ -1,9 +1,12 @@
 nodes = require './nodes'
 helpers = require './helpers'
 
+SuperMammouth = "\nfunction mammouth($func, $arg1, $arg2){if ( $func == '+' ){if((is_string($arg1) && is_numeric($arg2))||(is_string($arg2) && is_numeric($arg1))) {return $arg1.$arg2;} else {return $arg1+$arg2;}}}\n"
+
 exports.rewrite = (tree, context) ->
 	IdCounter = new helpers.IdCounter
 	UseSuperMammouth = false
+	AddSuperMammouth = false
 	php = ''
 	ADD = (string) ->
 		php += string
@@ -138,7 +141,7 @@ exports.rewrite = (tree, context) ->
 					r = compile(element.left) + '.' + compile(element.right)
 				else if element.operator is '+'
 					UseSuperMammouth = true
-					r = '$Mammouth("+", ' + compile(element.left) + ', ' + compile(element.right) + ')'
+					r = 'mammouth("+", ' + compile(element.left) + ', ' + compile(element.right) + ')'
 				else
 					r = compile(element.left) + ' ' + element.operator + ' ' + compile(element.right)
 				return r
@@ -174,7 +177,7 @@ exports.rewrite = (tree, context) ->
 				r = 'isset(' + compile(element.expression) + ')'
 				return r
 			when 'In'
-				r = '$Mammouth("in_array", ' + compile(element.left) + ', ' + compile(element.right) + ')'
+				r = 'mammouth("in_array", ' + compile(element.left) + ', ' + compile(element.right) + ')'
 				return r
 
 			# Simple Statements
@@ -395,5 +398,11 @@ exports.rewrite = (tree, context) ->
 	for doc in tree
 		switch doc.type
 			when 'PlainBlock' then ADD doc.toPHP()
-			when 'MammouthBlock' then ADD '<?php' + compile(doc.body) + '?>'
+			when 'MammouthBlock'
+				code = compile(doc.body)
+				if UseSuperMammouth and not AddSuperMammouth
+					code = SuperMammouth + code
+					AddSuperMammouth = true
+					UseSuperMammouth = false
+				ADD '<?php' + code + '?>'
 	return php
diff --git a/test.js b/test.js
@@ -4,12 +4,7 @@ function heredoc (f) {
 v = heredoc(function() {
 /*
 {{
-`sdfsdfsdfdsfsdsdfssdfssf
-dsfsdfs
-dd
-
-
-fsdfsdfsd`
+'123'+123
 }}
 */
 })