From 14dd1c754f5cb72705c3f61c039acc2084ebb7d8 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Sun, 28 Nov 2010 11:01:34 -0800 Subject: [PATCH] Rename namespaces to match file locations --HG-- branch : dev --- src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs | 2 +- src/Orchard.Tests.Modules/Scripting/ParserTests.cs | 5 ++--- .../Scripting/SimpleScriptingTests.cs | 2 +- src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs | 2 +- .../Modules/Orchard.Scripting/Ast/AbstractSyntaxTree.cs | 3 +-- src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs | 2 +- .../Modules/Orchard.Scripting/Ast/AstVisitor.cs | 2 +- .../Modules/Orchard.Scripting/Ast/BinaryAstNode.cs | 7 +++---- .../Modules/Orchard.Scripting/Ast/ConstantAstNode.cs | 4 ++-- .../Modules/Orchard.Scripting/Ast/ErrorAstNode.cs | 4 ++-- .../Modules/Orchard.Scripting/Ast/IAstNodeWithToken.cs | 4 ++-- .../Modules/Orchard.Scripting/Ast/MethodCallAstNode.cs | 4 ++-- .../Modules/Orchard.Scripting/Ast/UnaryAstNode.cs | 4 ++-- .../Modules/Orchard.Scripting/Compiler/Interpreter.cs | 5 ++--- .../Orchard.Scripting/Compiler/InterpreterVisitor.cs | 4 ++-- .../Modules/Orchard.Scripting/Compiler/Lexer.cs | 2 +- .../Modules/Orchard.Scripting/Compiler/Parser.cs | 8 +++----- .../Modules/Orchard.Scripting/Compiler/Token.cs | 2 +- .../Modules/Orchard.Scripting/Compiler/TokenKind.cs | 2 +- .../Modules/Orchard.Scripting/Compiler/Tokenizer.cs | 2 +- .../Modules/Orchard.Scripting/ScriptingManager.cs | 6 +++--- 21 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs b/src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs index ba2c2bf82..ba8f11835 100644 --- a/src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs +++ b/src/Orchard.Tests.Modules/Scripting/EvaluatorTests.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using NUnit.Framework; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; namespace Orchard.Tests.Modules.Scripting { [TestFixture] diff --git a/src/Orchard.Tests.Modules/Scripting/ParserTests.cs b/src/Orchard.Tests.Modules/Scripting/ParserTests.cs index 2444481aa..0397bec99 100644 --- a/src/Orchard.Tests.Modules/Scripting/ParserTests.cs +++ b/src/Orchard.Tests.Modules/Scripting/ParserTests.cs @@ -1,9 +1,8 @@ using System; using System.Diagnostics; using NUnit.Framework; -using Orchard.Scripting.SimpleScripting.Ast; -using Orchard.Widgets.SimpleScripting.Ast; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Ast; +using Orchard.Scripting.Compiler; namespace Orchard.Tests.Modules.Scripting { [TestFixture] diff --git a/src/Orchard.Tests.Modules/Scripting/SimpleScriptingTests.cs b/src/Orchard.Tests.Modules/Scripting/SimpleScriptingTests.cs index a93eaeb3f..6167ecdc5 100644 --- a/src/Orchard.Tests.Modules/Scripting/SimpleScriptingTests.cs +++ b/src/Orchard.Tests.Modules/Scripting/SimpleScriptingTests.cs @@ -1,8 +1,8 @@ using System.Linq; using NUnit.Framework; +using Orchard.Scripting; using Orchard.Tests.Stubs; using Orchard.Widgets.Services; -using Orchard.Widgets.SimpleScripting; namespace Orchard.Tests.Modules.Scripting { [TestFixture] diff --git a/src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs b/src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs index 48a72f996..38f74a903 100644 --- a/src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs +++ b/src/Orchard.Tests.Modules/Scripting/TokenizerTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; namespace Orchard.Tests.Modules.Scripting { [TestFixture] diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AbstractSyntaxTree.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AbstractSyntaxTree.cs index 9ad771174..4ae52fef0 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AbstractSyntaxTree.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AbstractSyntaxTree.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; -using Orchard.Widgets.SimpleScripting.Ast; -namespace Orchard.Scripting.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class AbstractSyntaxTree { public AstNode Root { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs index 6cc22b983..d5f22dc53 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Text; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public abstract class AstNode { public virtual IEnumerable Children { get { diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstVisitor.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstVisitor.cs index 6999d25f2..0ae94024b 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstVisitor.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstVisitor.cs @@ -1,6 +1,6 @@ using System.Linq; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class AstVisitor { public virtual object Visit(AstNode node) { return node.Accept(this); diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/BinaryAstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/BinaryAstNode.cs index 88ee38098..1764fc60c 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/BinaryAstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/BinaryAstNode.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; -using Orchard.Widgets.SimpleScripting.Compiler; +using System.Collections.Generic; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class BinaryAstNode : AstNode, IAstNodeWithToken { private readonly AstNode _left; private readonly Token _token; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ConstantAstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ConstantAstNode.cs index 3afd3ee91..040dc39de 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ConstantAstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ConstantAstNode.cs @@ -1,6 +1,6 @@ -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class ConstantAstNode : AstNode, IAstNodeWithToken { private readonly Token _token; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ErrorAstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ErrorAstNode.cs index c7aa6b455..801c152f8 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ErrorAstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/ErrorAstNode.cs @@ -1,7 +1,7 @@ using System; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class ErrorAstNode : AstNode, IAstNodeWithToken { private readonly Token _token; private readonly string _message; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/IAstNodeWithToken.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/IAstNodeWithToken.cs index 6321d1f5d..d1f005adc 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/IAstNodeWithToken.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/IAstNodeWithToken.cs @@ -1,6 +1,6 @@ -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public interface IAstNodeWithToken { Token Token { get; } } diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/MethodCallAstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/MethodCallAstNode.cs index 52b98f763..e04ce4e13 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/MethodCallAstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/MethodCallAstNode.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class MethodCallAstNode : AstNode, IAstNodeWithToken { private readonly Token _token; private readonly IList _arguments; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/UnaryAstNode.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/UnaryAstNode.cs index 7f9f4b756..d26449df7 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Ast/UnaryAstNode.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Ast/UnaryAstNode.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting.Ast { +namespace Orchard.Scripting.Ast { public class UnaryAstNode : AstNode, IAstNodeWithToken { private readonly AstNode _operand; private readonly Token _token; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Interpreter.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Interpreter.cs index 2a461b2e9..54a05aa8c 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Interpreter.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Interpreter.cs @@ -1,9 +1,8 @@ using System; using System.Collections.Generic; -using Orchard.Scripting.SimpleScripting.Ast; -using Orchard.Widgets.SimpleScripting.Ast; +using Orchard.Scripting.Ast; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class Interpreter { public EvaluationResult Evalutate(EvaluationContext context) { return new InterpreterVisitor(context).Evaluate(); diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs index 9805d6d5a..760f38e7a 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/InterpreterVisitor.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Orchard.Widgets.SimpleScripting.Ast; +using Orchard.Scripting.Ast; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class InterpreterVisitor : AstVisitor { private readonly EvaluationContext _context; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Lexer.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Lexer.cs index 6f70710ca..18a5cc13d 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Lexer.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Lexer.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class Lexer { private readonly Tokenizer _tokenizer; private readonly List _tokens= new List(); diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Parser.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Parser.cs index 63b93eda6..9812ab752 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Parser.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Parser.cs @@ -1,9 +1,7 @@ -using System; -using System.Collections.Generic; -using Orchard.Scripting.SimpleScripting.Ast; -using Orchard.Widgets.SimpleScripting.Ast; +using System.Collections.Generic; +using Orchard.Scripting.Ast; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class Parser { private readonly string _expression; private readonly Lexer _lexer; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs index 7514ece05..e813d9be8 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Token.cs @@ -1,6 +1,6 @@ using System; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class Token { public TokenKind Kind { get; set; } public int Position { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/TokenKind.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/TokenKind.cs index dd6f8245e..a7b5e2dcc 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/TokenKind.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/TokenKind.cs @@ -1,4 +1,4 @@ -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public enum TokenKind { Eof, OpenParen, diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs index 94b5952eb..4ff5d3c09 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs @@ -1,7 +1,7 @@ using System; using System.Text; -namespace Orchard.Widgets.SimpleScripting.Compiler { +namespace Orchard.Scripting.Compiler { public class Tokenizer { private readonly string _expression; private readonly StringBuilder _stringBuilder; diff --git a/src/Orchard.Web/Modules/Orchard.Scripting/ScriptingManager.cs b/src/Orchard.Web/Modules/Orchard.Scripting/ScriptingManager.cs index 2ff114bd0..ab2d8dda1 100644 --- a/src/Orchard.Web/Modules/Orchard.Scripting/ScriptingManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Scripting/ScriptingManager.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using Orchard.Caching; using Orchard.Localization; -using Orchard.Scripting.SimpleScripting.Ast; -using Orchard.Widgets.SimpleScripting.Compiler; +using Orchard.Scripting.Ast; +using Orchard.Scripting.Compiler; -namespace Orchard.Widgets.SimpleScripting { +namespace Orchard.Scripting { public class GlobalMethodContext { public string FunctionName { get; set; } public IList Arguments { get; set; }