Changeset 2138

Timestamp:

11/29/07 09:07:08 (6 years ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/:
マクロの処理を素直な流れに変更

Files:

• lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as (modified) (5 diffs)

lang/actionscript/flmml/trunk/src/com/txt_nifty/sketch/flmml/MML.as

@@ -227 +227 @@
         }
 
-        protected function next():void {
-            m_letter++;
+        protected function next(i:int = 1):void {
+            m_letter += 1;
         }
 
@@ -353 +353 @@
         }
 
-        protected function replaceMacro(str:String, startIndex:int, id:String, val:String):String {
-            var letter:int = startIndex;
-            var top:int = 1;
-            loop : while(letter < str.length) {
-                var c:String = str.charAt(letter++);
-                switch(c) {
-                case '$':
-                    // defining macro?
-                    if (top) {
-                        var last:int = str.indexOf(";", letter);
-                        if (last > letter) {
-                            var macro:String = str.substring(letter, last);
-                            var token:Array = macro.split("=");
-                            if (token.length >= 2 &&
-                                token[0].length >= 1) {
-                                var ids:Array = token[0].match("[a-zA-Z_][a-zA-Z_0-9#\+\(\)]*");
-                                // same macro -> replace
-                                if ((ids != null) && ids[0] == id) {
-                                    val = token[1];
-                                    str = remove(str, --letter, last);
-                                }
-                                // other macro -> skip identifier
-                                else {
-                                    letter += token[0].length;
-                                }
-                            }
-                        }
-                    }
-                    // replace
-                    if (str.substr(letter, id.length) == id) {
-                        str = str.substring(0, letter-1) + val + str.substring(letter + id.length);
-                        letter += id.length;
-                    }
-                    top = 0;
-                    break;
-                case ';':
-                    top = 1;
-                    break;
-                default:
-                    if (!StringUtil.isWhitespace(c) && c != '　') top = 0;
-                    break;
+        protected function getIndex(idArr:Array, id:String):int {
+            for(var i:int = 0; i < idArr.length; i++)
+                if (((String)(idArr[i])) == id) return i;
+            return -1;
+        }
+
+        protected function insertLenOrder(idArr:Array, valArr:Array, id:String, val:String):void {
+            var len:int = id.length;
+            var i:int;
+            for(i = 0; i < idArr.length; i++) {
+                if (len >= ((String)(idArr[i])).length) break;
+            }
+            idArr.splice(i, 0, id);
+            valArr.splice(i, 0, val);
+        }
+
+        protected function replaceMacro(idArr:Array, valArr:Array):void {
+            var i:int;
+            for(i = 0; i < idArr.length; i++) {
+                var id:String = idArr[i];
+                if (m_string.substr(m_letter, id.length) == idArr[i]) {
+                    //trace("["+m_string.substr(m_letter, id.length)+"]");
+                    m_string = m_string.substring(0, m_letter-1) + valArr[i] + m_string.substring(m_letter + id.length);
+                    m_letter += id.length;
+                    break;
+                }
+            }
+        }
+
+        protected function macroInMacro(str:String, idArr:Array, valArr:Array):String {
+            for(var i:int = 0; i < idArr.length; i++) {
+                var id:String = "$"+idArr[i];
+                //trace("id:"+id);
+                var idx:int = str.indexOf(id);
+                while(idx >= 0) {
+                    str = str.substring(0, idx-1) + valArr[i] + str.substring(idx + id.length);
+                    idx = str.indexOf(id, idx);
                 }
             }
             return str;
-        }
-
-        protected function quickSort(idArr:Array, valArr:Array, begin:int, end:int):void {
-            if (begin >= end) return;
-            var i:int, j:int;
-            var tmp:String;
-            var pivot:int = ((String)(idArr[(int)((begin + end) / 2)])).length;
-            i = begin;
-            j = end;
-            while(1) {
-                while(((String)(idArr[i])).length < pivot) ++i;
-                while(((String)(idArr[j])).length > pivot) --j;
-                if (i >= j) break;
-                tmp = idArr[i];
-                idArr[i] = idArr[j];
-                idArr[j] = tmp;
-                tmp = valArr[i];
-                valArr[i] = valArr[j];
-                valArr[j] = tmp;
-                i++;
-                j--;
-            }
-            if (begin < i - 1) quickSort(idArr, valArr, begin, i - 1);
-            if (j + 1 < end)   quickSort(idArr, valArr, j + 1, end);
-        }
-
-        protected function lengthSort(idArr:Array, valArr:Array):void {
-            quickSort(idArr, valArr, 0, idArr.length-1);
         }
 
@@ -444 +412 @@
                 switch(c) {
                 case '$':
+                    // macro definition?
                     if (top) {
                         var last:int = m_string.indexOf(";", m_letter);
@@ -456 +425 @@
                                     //trace("macro:$"+id[0]+"="+token[1]);
                                     if (id[0].length > 0) {
-                                        var f:int = 0;
-                                        for(i = 0; i < idArr.length; i++) {
-                                            if (idArr[i] == id[0]) { f = 1; break; }
+                                        m_string = remove(m_string, --m_letter, last);
+                                        var idx:int = getIndex(idArr, id[0]);
+                                        // first definition
+                                        if (idx < 0) {
+                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            //trace("define $"+id[i]+"="+token[1]);
+                                            insertLenOrder(idArr, valArr, id[i], token[1]);
                                         }
-                                        // first definition
-                                        if (f == 0) {
-                                            m_string = remove(m_string, --m_letter, last);
-                                            idArr[idArr.length] = id[0];
-                                            valArr[valArr.length] = token[1];
+                                        // macro redefinition
+                                        else {
+                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            //trace("redefine $"+id[i]+"="+token[1]);
+                                            valArr[idx] = token[1];
                                         }
                                     }
                                 }
                             }
+                            // macro use
+                            else {
+                                replaceMacro(idArr, valArr);
+                            }
                         }
+                        // macro use
+                        else {
+                            replaceMacro(idArr, valArr);
+                        }
+                    }
+                    // macro use
+                    else {
+                        replaceMacro(idArr, valArr);
                     }
                     break;
@@ -479 +464 @@
                     break;
                 }
-            }
-            lengthSort(idArr, valArr);
-            for(i = idArr.length-1; i >= 0; i--) {
-                //trace("macro["+idArr[i]+"]"+valArr[i]);
-                for(var j:int = 0; j < valArr.length; j++) {
-                    if (i != j) valArr[j] = replaceMacro(valArr[j], 0, idArr[i], valArr[i]);
-                }
-                m_string = replaceMacro(m_string, 0, idArr[i], valArr[i]);
             }
         }