parsing enhancements

darrenkopp · Oct 3, 2013 · 84e5f29 · 84e5f29
1 parent ec2948b
commit 84e5f29
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/SassyStudio.Compiler/Parsing/ConditionalControlDirective.cs b/SassyStudio.Compiler/Parsing/ConditionalControlDirective.cs
@@ -89,6 +89,7 @@ private bool IsConditionTerminator(TokenType type)
             {
                 case TokenType.EndOfFile:
                 case TokenType.OpenCurlyBrace:
+                case TokenType.CloseCurlyBrace:
                     return true;
 
                 default:

diff --git a/SassyStudio.Compiler/Parsing/Function.cs b/SassyStudio.Compiler/Parsing/Function.cs
@@ -33,7 +33,7 @@ public override bool Parse(IItemFactory itemFactory, ITextProvider text, ITokenS
 
                 ParseArguments(itemFactory, text, stream);
 
-                if (stream.Current.Type == TokenType.CloseFunctionBrace)
+                if (OpenBrace != null && stream.Current.Type == TokenType.CloseFunctionBrace)
                     CloseBrace = Children.AddCurrentAndAdvance(stream, SassClassifierType.FunctionBrace);
             }
 

diff --git a/SassyStudio.Compiler/Parsing/IVariableScope.cs b/SassyStudio.Compiler/Parsing/IVariableScope.cs
diff --git a/SassyStudio.Compiler/SassyStudio.Compiler.csproj b/SassyStudio.Compiler/SassyStudio.Compiler.csproj
@@ -48,7 +48,6 @@
     <Compile Include="Parsing\DocumentParserFactory.cs" />
     <Compile Include="Parsing\PercentageUnit.cs" />
     <Compile Include="Parsing\Rules\FontFaceDirective.cs" />
-    <Compile Include="Parsing\IVariableScope.cs" />
     <Compile Include="Lexing\DefaultLexerFactory.cs" />
     <Compile Include="Lexing\ILexer.cs" />
     <Compile Include="Lexing\ILexerFactory.cs" />