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

Timestamp:

10/02/08 01:32:37 (3 months ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/: マクロを再帰的定義したときのバグをとりあえず修正。FM音源はまだ封印。

Files:

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

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

@@ -21 +21 @@
         protected var m_noteShift:int;
         protected var m_warning:String;
+        protected var m_maxPipe:int;
+        protected static var MAX_PIPE:int = 3;
 
         public function MML() {
@@ -191 +193 @@
                 m_tracks[m_trackNo].recGate2(getUInt(2) * 2); // '*2' according to TSSCP
                 break;
+                /*case 'i': // Input
+                {
+                    var sens:int = 0;
+                    next();
+                    sens = getUInt(sens);
+                    if (getChar() == ',') {
+                        next();
+                        a = getUInt(a);
+                        if (a > m_maxPipe) a = m_maxPipe;
+                    }
+                    m_tracks[m_trackNo].recInput(sens, a);
+                }
+                // @i[n],[m]   m:pipe no
+                // if (n == 0) off
+                // else sensitivity = n (max:8)
+                break;
+            case 'o': // Output
+                {
+                    var mode:int = 0;
+                    next();
+                    mode = getUInt(mode);
+                    if (getChar() == ',') {
+                        next();
+                        a = getUInt(a);
+                        if (a > m_maxPipe) {
+                            m_maxPipe = a;
+                            if (m_maxPipe >= MAX_PIPE) m_maxPipe = a = MAX_PIPE;
+                        }
+                    }
+                    m_tracks[m_trackNo].recOutput(mode, a);
+                }
+                // @o[n],[m]   m:pipe no
+                // if (n == 0) off
+                // if (n == 1) overwrite
+                // if (n == 2) add
+                break;*/
             default:
                 m_form = getUInt(m_form);
@@ -436 +474 @@
         }
 
-        protected function macroInMacro(str:String, idArr:Array, valArr:Array):String {
+        protected function macroInMacro(str:String, idArr:Array, valArr:Array, id0:String):String {
+            var idx:int;
             for(var i:int = 0; i < idArr.length; i++) {
                 var id:String = "$"+idArr[i];
                 //trace("id:"+id);
-                var idx:int = str.indexOf(id);
+                idx = str.indexOf(id);
                 while(idx >= 0) {
                     str = str.substring(0, idx) + valArr[i] + str.substring(idx + id.length);
                     idx = str.indexOf(id, idx);
                 }
+            }
+            // recursive call is prevented.
+            id0 = "$" + id0;
+            idx = str.indexOf(id0);
+            while(idx >= 0) {
+                str = str.substring(0, idx) + valArr[i] + str.substring(idx + id0.length);
+                idx = str.indexOf(id0, idx);
+                warning(MWarning.RECURSIVE_MACRO, id0);
             }
             return str;
@@ -454 +501 @@
             var idArr:Array = new Array();
             var valArr:Array = new Array();
-            var i:int;
             var last:int;
             // [a-zA-Z][a-zA-Z0-9#\+\(\)_]*
@@ -483 +529 @@
                                         // first definition
                                         if (idx < 0) {
-                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            token[1] = macroInMacro(token[1], idArr, valArr, id[0]);
                                             //trace("define $"+id[i]+"="+token[1]);
-                                            insertLenOrder(idArr, valArr, id[i], token[1]);
+                                            insertLenOrder(idArr, valArr, id[0], token[1]);
                                         }
                                         // macro redefinition
                                         else {
-                                            token[1] = macroInMacro(token[1], idArr, valArr);
+                                            token[1] = macroInMacro(token[1], idArr, valArr, id[0]);
                                             //trace("redefine $"+id[i]+"="+token[1]);
                                             valArr[idx] = token[1];
@@ -592 +638 @@
             m_form = MOscillator.PULSE;
             m_noteShift = 0;
+            m_maxPipe = 0;
 
             processComment(str);
@@ -616 +663 @@
                 m_sequencer.connect(m_tracks[i]);
             }
+            m_sequencer.createPipes(m_maxPipe+1);
 
             // dispatch event