From 3dd657c228ec7d43a069e3fef58c98399dd8cf1d Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 28 Oct 2013 11:28:32 -0700
Subject: [PATCH] Fix #59

---
 stdx/d/ast.d    |  4 ++--
 stdx/d/parser.d | 27 +++++++++++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/stdx/d/ast.d b/stdx/d/ast.d
index 4ca8f64..33277e8 100644
--- a/stdx/d/ast.d
+++ b/stdx/d/ast.d
@@ -844,10 +844,10 @@ class ConditionalDeclaration : ASTNode
 public:
     override void accept(ASTVisitor visitor)
     {
-        mixin (visitIfNotNull!(compileCondition, trueDeclaration, falseDeclaration));
+        mixin (visitIfNotNull!(compileCondition, trueDeclarations, falseDeclaration));
     }
     /** */ CompileCondition compileCondition;
-    /** */ Declaration trueDeclaration;
+    /** */ Declaration[] trueDeclarations;
     /** */ Declaration falseDeclaration;
 }
 
diff --git a/stdx/d/parser.d b/stdx/d/parser.d
index d3c1439..630093e 100644
--- a/stdx/d/parser.d
+++ b/stdx/d/parser.d
@@ -50,6 +50,11 @@
  * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Authors: Brian Schott
  * Source: $(PHOBOSSRC std/d/_parser.d)
+ * Macros:
+ * GRAMMAR = <pre>$0</pre>
+ * RULEDEF = <a name="$0"><span style="font-weight: bold;">$0</span></a>
+ * RULE = <a href="#$0"><span style="font-weight: bold;">$0</span></a>
+ * LITERAL = <span style="color: green;">$0</span>
  */
 
 module stdx.d.parser;
@@ -438,7 +443,7 @@ alias core.sys.posix.stdio.fileno fileno;
      *
      * $(GRAMMAR $(RULEDEF asmInstruction):
      *     $(LITERAL Identifier)
-     *     | $(LITERAL 'align') $(RULE IntegerLiteral)
+     *     | $(LITERAL 'align') $(LITERAL IntegerLiteral)
      *     | $(LITERAL 'align') $(LITERAL Identifier)
      *     | $(LITERAL Identifier) $(LITERAL ':') $(RULE asmInstruction)
      *     | $(LITERAL Identifier) $(RULE asmExp)
@@ -512,8 +517,8 @@ alias core.sys.posix.stdio.fileno fileno;
      * Parses an AsmPrimaryExp
      *
      * $(GRAMMAR $(RULEDEF asmPrimaryExp):
-     *       $(RULE IntegerLiteral)
-     *     | $(RULE FloatLiteral)
+     *       $(LITERAL IntegerLiteral)
+     *     | $(LITERAL FloatLiteral)
      *     | $(RULE register)
      *     | $(RULE identifierChain)
      *     | $(LITERAL '$')
@@ -1365,7 +1370,9 @@ class ClassFour(A, B) if (someTest()) : Super {}}c;
      * Parses a ConditionalDeclaration
      *
      * $(GRAMMAR $(RULEDEF conditionalDeclaration):
-     *     $(RULE compileCondition) ($(RULE declaration) | $(LITERAL '{') $(RULE declaration)* $(LITERAL '}')) ($(LITERAL 'else') ($(RULE declaration) | $(LITERAL '{') $(RULE declaration)* $(LITERAL '}')))?
+     *       $(RULE compileCondition) $(RULE declaration)
+     *     | $(RULE compileCondition) $(LITERAL ':') $(RULE declaration)+
+     *     | $(RULE compileCondition) $(RULE declaration) ($(LITERAL 'else') $(RULE declaration))?
      *     ;)
      */
     ConditionalDeclaration parseConditionalDeclaration()
@@ -1374,9 +1381,17 @@ class ClassFour(A, B) if (someTest()) : Super {}}c;
         auto node = new ConditionalDeclaration;
         node.compileCondition = parseCompileCondition();
 
+        if (currentIs(TokenType.colon))
+        {
+            advance();
+            while (isDeclaration())
+                node.trueDeclarations ~= parseDeclaration();
+            return node;
+        }
+
         auto dec = parseDeclaration();
         if (dec is null) return null;
-        node.trueDeclaration = dec;
+        node.trueDeclarations ~= dec;
 
         if(currentIs(TokenType.else_))
             advance();
@@ -4185,7 +4200,7 @@ q{(int a, ...)
      *
      * $(GRAMMAR $(RULEDEF register):
      *     $(LITERAL Identifier)
-     *     | $(LITERAL Identifier) $(LITERAL '$(LPAREN)') $(RULE IntegerLiteral) $(LITERAL '$(RPAREN)')
+     *     | $(LITERAL Identifier) $(LITERAL '$(LPAREN)') $(LITERAL IntegerLiteral) $(LITERAL '$(RPAREN)')
      *     ;)
      */
     Register parseRegister()