Changeset 2293 for lang/actionscript/flmml/trunk/src

Timestamp:

12/02/07 19:16:16 (5 years ago)

Author:

tekisuke

Message:

lang/actionscript/flmml/:
/*と */ の間をコメントとするよう変更。

Location:

lang/actionscript/flmml/trunk/src

Files:

• com/txt_nifty/sketch/flmml/MML.as (modified) (3 diffs)
• com/txt_nifty/sketch/flmml/MWarning.as (modified) (1 diff)
• flmml.swf (modified) (previous)

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

@@ -397 +397 @@
         }
 
-        protected function processMacro(str:String):void {
-            m_string = str;
+        protected function processMacro():void {
             begin();
             var top:int = 1;
@@ -469 +468 @@
         }
 
+        protected function processComment(str:String):void {
+            m_string = str;
+            begin();
+            var commentStart:int = -1;
+            while(m_letter < m_string.length) {
+                var c:String = getCharNext();
+                switch(c) {
+                case '/':
+                    if (getChar() == '*') {
+                        if (commentStart < 0) commentStart = m_letter - 1;
+                        next();
+                    }
+                    break;
+                case '*':
+                    if (getChar() == '/') {
+                        if (commentStart >= 0) {
+                            m_string = remove(m_string, commentStart, m_letter);
+                            m_letter = commentStart;
+                            commentStart = -1;
+                        }
+                        else {
+                            warning(MWarning.UNOPENED_COMMENT, "");
+                        }
+                    }
+                    break;
+                default:
+                    break;
+                }
+            }
+            if (commentStart >= 0) warning(MWarning.UNCLOSED_COMMENT, "");
+        }
+
         static public function removeWhitespace(str:String):String {
             return str.replace(new RegExp("[ 　\n\r\t\f]+","g"),"");
@@ -496 +527 @@
             m_form = MOscillator.PULSE;
 
-            processMacro(str);
+            processComment(str);
+            //trace(m_string);
+            processMacro();
             //trace(m_string);
             m_string = removeWhitespace(m_string);

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

@@ -1 +1 @@
 package com.txt_nifty.sketch.flmml {
     public final class MWarning {
-        public static const UNKNOWN_COMMAND:int = 0;
-        public static const UNCLOSED_REPEAT:int = 1;
+        public static const UNKNOWN_COMMAND:int  = 0;
+        public static const UNCLOSED_REPEAT:int  = 1;
+        public static const UNOPENED_COMMENT:int = 2;
+        public static const UNCLOSED_COMMENT:int = 3;
         public static const s_string:Array = [
                                               "対応していないコマンド '%s' があります。",
-                                              "終わりが見つからない繰り返しがあります。"
+                                              "終わりが見つからない繰り返しがあります。",
+                                              "始まりが見つからないコメントがあります。",
+                                              "終わりが見つからないコメントがあります。"
                                               ];
         public static function getString(warnId:int, str:String):String {