Merge pull request MonoGame#1475 from SickheadGames/mgfx2

Allow Texture Name In Sampler Using Parenthesis
raznikk · Mar 9, 2013 · 3ff361a · 3ff361a
2 parents cc3c35c + c8c86ac
commit 3ff361a
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 16 deletions.
diff --git a/Tools/2MGFX/MGFX.tpg b/Tools/2MGFX/MGFX.tpg
@@ -114,7 +114,7 @@ PixelShader_Pass_Expression -> PixelShader Equals Compile ShaderModel Identifier
    return null;
 };
 
-Sampler_State_Expression -> Identifier Equals (LessThan Identifier GreaterThan | Identifier | Number) Semicolon
+Sampler_State_Expression -> Identifier Equals ((LessThan|OpenParenthesis) Identifier (GreaterThan|CloseParenthesis) | Identifier | Number) Semicolon
 {
 	var name = $Identifier[0] as string;
 	var value = ($Identifier[1] ?? ($Identifier[2] ?? $Number[0])) as string;	

diff --git a/Tools/2MGFX/Parser.cs b/Tools/2MGFX/Parser.cs
@@ -509,19 +509,39 @@ private void ParseSampler_State_Expression(ParseNode parent)
             }
 
 
-            tok = scanner.LookAhead(TokenType.LessThan, TokenType.Identifier, TokenType.Number);
+            tok = scanner.LookAhead(TokenType.LessThan, TokenType.OpenParenthesis, TokenType.Identifier, TokenType.Number);
             switch (tok.Type)
             {
                 case TokenType.LessThan:
+                case TokenType.OpenParenthesis:
 
 
-                    tok = scanner.Scan(TokenType.LessThan);
-                    n = node.CreateNode(tok, tok.ToString() );
-                    node.Token.UpdateRange(tok);
-                    node.Nodes.Add(n);
-                    if (tok.Type != TokenType.LessThan) {
-                        tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.LessThan.ToString(), 0x1001, tok));
-                        return;
+                    tok = scanner.LookAhead(TokenType.LessThan, TokenType.OpenParenthesis);
+                    switch (tok.Type)
+                    {
+                        case TokenType.LessThan:
+                            tok = scanner.Scan(TokenType.LessThan);
+                            n = node.CreateNode(tok, tok.ToString() );
+                            node.Token.UpdateRange(tok);
+                            node.Nodes.Add(n);
+                            if (tok.Type != TokenType.LessThan) {
+                                tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.LessThan.ToString(), 0x1001, tok));
+                                return;
+                            }
+                            break;
+                        case TokenType.OpenParenthesis:
+                            tok = scanner.Scan(TokenType.OpenParenthesis);
+                            n = node.CreateNode(tok, tok.ToString() );
+                            node.Token.UpdateRange(tok);
+                            node.Nodes.Add(n);
+                            if (tok.Type != TokenType.OpenParenthesis) {
+                                tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.OpenParenthesis.ToString(), 0x1001, tok));
+                                return;
+                            }
+                            break;
+                        default:
+                            tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found.", 0x0002, tok));
+                            break;
                     }
 
 
@@ -535,13 +555,32 @@ private void ParseSampler_State_Expression(ParseNode parent)
                     }
 
 
-                    tok = scanner.Scan(TokenType.GreaterThan);
-                    n = node.CreateNode(tok, tok.ToString() );
-                    node.Token.UpdateRange(tok);
-                    node.Nodes.Add(n);
-                    if (tok.Type != TokenType.GreaterThan) {
-                        tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.GreaterThan.ToString(), 0x1001, tok));
-                        return;
+                    tok = scanner.LookAhead(TokenType.GreaterThan, TokenType.CloseParenthesis);
+                    switch (tok.Type)
+                    {
+                        case TokenType.GreaterThan:
+                            tok = scanner.Scan(TokenType.GreaterThan);
+                            n = node.CreateNode(tok, tok.ToString() );
+                            node.Token.UpdateRange(tok);
+                            node.Nodes.Add(n);
+                            if (tok.Type != TokenType.GreaterThan) {
+                                tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.GreaterThan.ToString(), 0x1001, tok));
+                                return;
+                            }
+                            break;
+                        case TokenType.CloseParenthesis:
+                            tok = scanner.Scan(TokenType.CloseParenthesis);
+                            n = node.CreateNode(tok, tok.ToString() );
+                            node.Token.UpdateRange(tok);
+                            node.Nodes.Add(n);
+                            if (tok.Type != TokenType.CloseParenthesis) {
+                                tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found. Expected " + TokenType.CloseParenthesis.ToString(), 0x1001, tok));
+                                return;
+                            }
+                            break;
+                        default:
+                            tree.Errors.Add(new ParseError("Unexpected token '" + tok.Text.Replace("\n", "") + "' found.", 0x0002, tok));
+                            break;
                     }
                     break;
                 case TokenType.Identifier: