Changeset 32797 for lang/actionscript

Timestamp:

04/25/09 13:20:14 (3 years ago)

Author:

tekisuke

Message:

マクロ再帰呼び出しの検出に不具合があったということでarcheさんの修正をコミット。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MML.as (modified) (4 diffs)
• flmml.swf (modified) (previous)

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

@@ -523 +523 @@
 
         // 09/04/03 arche [ADD] begin
-        protected function replaceMacro(macroTable:Array):void {
+        protected function replaceMacro(macroTable:Array):Boolean {
             for each(var macro:Object in macroTable){
                 if(m_string.substr(m_letter, macro.id.length) == macro.id){
@@ -560 +560 @@
                     m_letter = start - 1;
                     //trace(m_string.substring(m_letter));
-                    break;
-                }
-            }
+                    return true;
+                }
+            }
+            return false;
         }
         // 09/04/03 arche [ADD] end
@@ -636 +637 @@
                                                 while(m_letter < last){
                                                     if(c == "$"){
-                                                        if(m_string.substr(m_letter, id.length) == id){
-                                                            m_letter--;
-                                                            m_string = remove(m_string, m_letter, m_letter + id.length);
-                                                            warning(MWarning.RECURSIVE_MACRO, id);
-                                                        }else{
-                                                            replaceMacro(macroTable);
-                                                        }
+                                                        if(!replaceMacro(macroTable)){
+                                                        if(m_string.substr(m_letter, id.length) == id){
+                                                            m_letter--;
+                                                            m_string = remove(m_string, m_letter, m_letter + id.length);
+                                                            warning(MWarning.RECURSIVE_MACRO, id);
+                                                        }
+                                                    }
                                                         last = m_string.indexOf(";", m_letter);
                                                     }
@@ -649 +650 @@
                                                 var pos:int = 0;
                                                 for(; pos < macroTable.length; pos++){
+                                                 if(macroTable[pos].id == id){
+                                                     macroTable.splice(pos, 1);
+                                                     pos--;
+                                                     continue;
+                                                 }
                                                         if(macroTable[pos].id.length < id.length){
                                                                 break;