Упрощённый синтаксис для play music

src/com/annimon/everlastingsummer/Parser.java

@@ -393,11 +393,7 @@ public final class Parser {
     }
     
     private boolean playMusic() {
-        consume(TokenType.WORD);
-        consume(TokenType.LBRACKET);
-        final String name = consume(TokenType.TEXT).getText();
-        consume(TokenType.RBRACKET);
-        
+        final String name = consumeMusicName();
         final FadeInfo fade = matchFade();
         ViewActivity.getInstance().music(name, fade);
         return false;
@@ -733,6 +729,22 @@ public final class Parser {
         return "true".equalsIgnoreCase(consume(TokenType.WORD).getText());
     }
     
+    private String consumeMusicName() {
+        final String name;
+        if (lookMatch(1, TokenType.LBRACKET)) {
+            // music_list["music"]
+            consume(TokenType.WORD);
+            consume(TokenType.LBRACKET);
+            name = consume(TokenType.TEXT).getText();
+            consume(TokenType.RBRACKET);
+        } else if (lookMatch(0, TokenType.TEXT)) {
+            name = consume(TokenType.TEXT).getText();
+        } else {
+            name = consume(TokenType.WORD).getText();
+        }
+        return name;
+    }
+    
     private FadeInfo matchFade() {
         final FadeInfo result = new FadeInfo();
         if (match(TokenType.FADEIN)) {