constructor

horitaku1124 · Jun 13, 2018 · 21f1dd4 · 21f1dd4
1 parent 40c4622
commit 21f1dd4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 4 deletions.
diff --git a/convert.html b/convert.html
@@ -109,6 +109,7 @@
         let inPhpCode = false;
         let phpCodeArray = [];
         let line = 1, chars = 0;
+        let className = null;
         const appendCode = (token) => {
             phpCodeArray.push(new CodeVal(token, line, chars));
         };
@@ -165,11 +166,20 @@
                     appendCode(token + tokens[i + 1]);
                     i += 1;
                 } else if(token.match(/^function$/i)) {
-                    appendCode(token);
-                    if(nextWord.match(/^ +$/) && next2Word.match(/^[a-zA-Z\_0-9]+$/)) {
+                    if (className != null && next2Word === className) {
+                        console.log(" constructor to __construct (" + line + ", " + chars + ")");
+                        appendCode("public");
+                        appendCode(nextWord);
+                        appendCode("function");
+                        appendCode(" __construct");
+                        i += 2;
+                    } else if(nextWord.match(/^ +$/) && next2Word.match(/^[a-zA-Z_0-9]+$/)) {
+                        appendCode(token);
                         appendCode(nextWord);
                         appendCode(next2Word);
                         i += 2;
+                    } else {
+                        appendCode(token);
                     }
                 } else if (/^array$/i.test(token)) {
                     if (nextWord === "(" && next2Word === ")") {
@@ -179,6 +189,12 @@
                     } else {
                         appendCode(token);
                     }
+                } else if (/^class/i.test(token) && /^[a-zA-Z_0-9]+$/.test(next2Word)) {
+                    className = next2Word;
+                    appendCode(token);
+                    appendCode(nextWord);
+                    appendCode(next2Word);
+                    i += 2
                 } else {
                     if(nextWord == "(" && token.match(/^[a-zA-Z\_0-9]+$/)) {
                         if(token.match(/^split$/i)) {
@@ -279,6 +295,8 @@
     var $text3 = "<html><body bgcolor=\"white;\"></html>";
     var $text4 = '<html><body bgcolor=\'white;\'></html>';
     var $ary1 = array();
+    function TestClass1() {
+    }
 
     function val() {
         return $this->val;

diff --git a/js/phpParser.js b/js/phpParser.js
@@ -5,6 +5,7 @@ phpParser.run = function(tokens){
     let inPhpCode = false;
     let phpCodeArray = [];
     let line = 1, chars = 0;
+    let className = null;
     const appendCode = (token) => {
         phpCodeArray.push(new CodeVal(token, line, chars));
     };
@@ -62,11 +63,20 @@ phpParser.run = function(tokens){
                 appendCode(token + tokens[i + 1]);
                 i += 1;
             } else if(token.match(/^function$/i)) {
-                appendCode(token);
-                if(nextWord.match(/^ +$/) && next2Word.match(/^[a-zA-Z\_0-9]+$/)) {
+                if (className != null && next2Word === className) {
+                    console.log(" constructor to __construct (" + line + ", " + chars + ")");
+                    appendCode("public");
+                    appendCode(nextWord);
+                    appendCode("function");
+                    appendCode(" __construct");
+                    i += 2;
+                } else if(nextWord.match(/^ +$/) && next2Word.match(/^[a-zA-Z_0-9]+$/)) {
+                    appendCode(token);
                     appendCode(nextWord);
                     appendCode(next2Word);
                     i += 2;
+                } else {
+                    appendCode(token);
                 }
             } else if (/^array$/i.test(token)) {
                 if (nextWord === "(" && next2Word === ")") {
@@ -76,6 +86,12 @@ phpParser.run = function(tokens){
                 } else {
                     appendCode(token);
                 }
+            } else if (/^class/i.test(token) && /^[a-zA-Z_0-9]+$/.test(next2Word)) {
+                className = next2Word;
+                appendCode(token);
+                appendCode(nextWord);
+                appendCode(next2Word);
+                i += 2
             } else {
                 if(nextWord == "(" && token.match(/^[a-zA-Z\_0-9]+$/)) {
                     if(token.match(/^split$/i)) {

diff --git a/php-codes/test1.php b/php-codes/test1.php
@@ -11,6 +11,9 @@ class TestClass1 {
     var $text4 = '<html><body bgcolor=\'white;\'></html>';
     var $ary1 = array();
 
+    function TestClass1() {
+    }
+
     function val() {
         return $this->val;
     }