Changeset 9598

Timestamp:

04/17/08 00:39:07 (5 years ago)

Author:

tarchan

Message:

lang/java/NanikaKit: 里々スクリプトの評価を修正 #95

Location:

lang/java/NanikaKit/trunk/src

Files:

• com/mac/tarchan/nanika/SakuraGhost.java (modified) (3 diffs)
• test/com/mac/tarchan/nanika/NiseSatori.java (modified) (14 diffs)

lang/java/NanikaKit/trunk/src/com/mac/tarchan/nanika/SakuraGhost.java

@@ -9 +9 @@
 
 import java.awt.Component;
+import java.awt.EventQueue;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -454 +455 @@
          * @return このゴーストへの参照
          */
-        public SakuraGhost waitTime(long ms)
-        {
-                try
-                {
-                        Thread.sleep(ms);
-                }
-                catch (InterruptedException e)
-                {
-                }
-
-                return this;
-        }
-
-        /**
-         * えんいー
-         * 
-         * @return このゴーストへの参照
-         */
-        public SakuraGhost yen_e()
-        {
+        public SakuraGhost waitTime(final long ms)
+        {
+                EventQueue.invokeLater(new Runnable()
+                {
+                        public void run()
+                        {
+                                try
+                                {
+                                        Thread.sleep(ms);
+                                }
+                                catch (InterruptedException e)
+                                {
+                                        log.error("sleep error: " + ms, e);
+                                }
+                        }
+                });
+
                 return this;
         }
@@ -525 +523 @@
                         kero.draw(g);
                 }
+                observer.getToolkit().sync();
         }
 

lang/java/NanikaKit/trunk/src/test/com/mac/tarchan/nanika/NiseSatori.java

@@ -52 +52 @@
 
         /** 区切り文字 */
-        Pattern delimiter = Pattern.compile("(＠|＊|＃).*");
+        Pattern delimiter = Pattern.compile("[＠＊＃](.*)");
 
         /**
@@ -63 +63 @@
         public boolean load(NanikaArchive nar)
         {
+                // TODO load(File ghost) をシミュレートすべきか？
                 log.debug("satori nar: " + nar);
                 File ghostDir = nar.getGhostDirectory();
@@ -171 +172 @@
                                         // トーク
                                         log.trace("トーク=" + line);
-                                        line = scanTalk(s, line);
+                                        line = scanTalk(s, s.match().group(1));
                                 }
                                 else if (line.startsWith("＠"))
@@ -204 +205 @@
         private String scanTalk(Scanner s, String line)
         {
-                String key = line.substring(1);
+                String key = line;
                 StringBuilder value = new StringBuilder();
                 while (true)
@@ -260 +261 @@
                 log.trace(String.format("\"%s\"=\"%s\"", key , value));
                 talks.put(key , value);
-//              List<String> list = talks.get(key);
-//              if (list == null)
-//              {
-//                      list = new LinkedList<String>();
-//                      talks.put(key, list);
-//              }
-//              list.add(value);
         }
 
@@ -281 +275 @@
                 log.trace(String.format("\"%s\"=\"%s\"", key , value));
                 words.put(key , value);
-//              List<String> list = words.get(key);
-//              if (list == null)
-//              {
-//                      list = new LinkedList<String>();
-//                      words.put(key, list);
-//              }
-//              list.add(value);
         }
 
@@ -302 +289 @@
         {
                 return talks.get(key);
-//              List<String> list = talks.get(key);
-//              if (list == null) return null;
-//
-//              int len = list.size();
-//              int index = rand.nextInt(len);
-//              String talk = list.get(index);
-//              return talk;
         }
 
@@ -320 +300 @@
         {
                 return words.get(key);
-//              List<String> list = words.get(key);
-//              if (list == null) return null;
-//
-//              int len = list.size();
-//              int index = rand.nextInt(len);
-//              String word = list.get(index);
-//              return word;
         }
 
@@ -340 +313 @@
                 log.debug("command: " + command);
 //              return "\\0\\s[0]こんにちは。\\1\\s[10]よぉ。\\e";
+
                 String talk = getTalk("");
                 log.debug("里々=" + talk);
+
                 talk = eval(talk);
                 log.debug("さくら=" + talk);
+
                 return talk;
         }
@@ -359 +335 @@
                 buf.append("\\0\\s[0]\\1\\s[10]");
                 int scope = 1;
-//              Pattern p = Pattern.compile("(?：|（(.+)）)");
-//              while (s.hasNextLine())
+                int wait = 100;
                 while (true)
                 {
-                        String find = s.findInLine("：|（.+?）|\n|[^：（]+");
+                        String find = s.findInLine("：|（(.+?)）|、|。|\n|[^：（、。]+");
                         if (find == null) break;
                         log.debug("find=" + find);
@@ -369 +344 @@
                         if (find.startsWith("："))
                         {
+                                // スコープ切り替え
                                 scope = scope != 0 ? 0 : 1;
                                 buf.append("\\");
@@ -375 +351 @@
                         else if (find.startsWith("（"))
                         {
-                                String key = find.substring(1, find.length() - 1);
+                                // サーフェス切り替え
+//                              String key = find.substring(1, find.length() - 1);
+                                String key = s.match().group(1);
                                 try
                                 {
@@ -385 +363 @@
                                 catch (NumberFormatException e)
                                 {
+                                        // 単語置き換え
                                         String word = getWord(key);
                                         if (word == null) word = "{" + key + "}";
@@ -390 +369 @@
                                 }
                         }
+                        else if (find.startsWith("、"))
+                        {
+                                // 読点
+                                buf.append("、");
+                                buf.append("\\_w[");
+                                buf.append(wait);
+                                buf.append("]");
+                        }
+                        else if (find.startsWith("。"))
+                        {
+                                // 句点
+                                buf.append("。");
+                                buf.append("\\_w[");
+                                buf.append(wait);
+                                buf.append("]");
+                        }
                         else if (find.startsWith("\n"))
                         {
+                                // 改行
                                 buf.append("\\n");
                         }
                         else
                         {
+                                // テキスト
                                 buf.append(find);
                         }
                 }
 
+                // さくらスクリプトを返す
                 return replace(replace_after, buf.toString());
         }