Выделена обработка директивы импорта (Использовать)

Author: Mr-Rm

src/ScriptEngine/Compiler/Compiler.cs

@@ -263,6 +263,7 @@ private void AppendCodeInfo(CompilerException exc, int line, int column)
 
         private void DispatchModuleBuild()
         {
+            HandleImportDirectives();
             while (_lastExtractedLexem.Type != LexemType.EndOfText)
             {
                 if (_lastExtractedLexem.Type == LexemType.Identifier)
@@ -425,16 +426,26 @@ private static void FillVariablesFrame(ref MethodDescriptor descriptor, SymbolSc
             }
         }
 
-        private void HandleDirective(bool codeEntered)
+        private void HandleDirective()
         {
             var directive = _lastExtractedLexem.Content;
-
             var value = _lexer.Iterator.ReadToLineEnd();
 
-            if (DirectiveHandler == null || !DirectiveHandler(directive, value, codeEntered))
+            if (DirectiveHandler == null || !DirectiveHandler(directive, value, _isCodeEntered))
                 throw new CompilerException(String.Format("Неизвестная директива: {0}({1})", directive, value));
         }
 
+        private void HandleImportDirectives()
+        {
+            while (_lastExtractedLexem.Type == LexemType.PreprocessorDirective)
+            {
+                HandleDirective();
+                UpdateCompositeContext(); // костыль для #330
+
+                _lastExtractedLexem = _lexer.NextLexem();
+            }
+        }
+
         private void BuildSingleMethod()
         {
             var entryPoint = _module.Code.Count;
@@ -713,6 +724,11 @@ private void BuildCodeBatch(params Token[] endTokens)
                     continue;
                 }
 
+                if (_lastExtractedLexem.Type == LexemType.PreprocessorDirective)
+                {
+                    throw new CompilerException(String.Format("Недопустимая директива: {0}", _lastExtractedLexem.Content));
+                }
+
                 if (_lastExtractedLexem.Type != LexemType.Identifier && _lastExtractedLexem.Token != Token.EndOfText)
                 {
                     throw CompilerException.UnexpectedOperation();
@@ -1973,13 +1989,6 @@ private void NextToken()
             if (_lastExtractedLexem.Token != Token.EndOfText)
             {
                 _lastExtractedLexem = _lexer.NextLexem();
-                while (_lastExtractedLexem.Type == LexemType.PreprocessorDirective)
-                {
-                    HandleDirective(_isCodeEntered);
-                    UpdateCompositeContext(); // костыль для #330
-
-                    _lastExtractedLexem = _lexer.NextLexem();
-                }
             }
             else
             {