namespace refactoring
This commit is contained in:
Родитель
78d6851cbc
Коммит
abcca0c9b3
|
@ -4,9 +4,9 @@ using System.Collections.Generic;
|
|||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents <c>array</c> constructor.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Base class for assignment expressions (by-value and by-ref).
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Binary expression.
|
||||
|
|
|
@ -3,9 +3,9 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region IncludingEx
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ using System.Collections.Generic;
|
|||
using System.Diagnostics;
|
||||
using System.Collections;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region ActualParam
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@ using System.Collections.Generic;
|
|||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a concatenation expression (dot PHP operator).
|
||||
|
|
|
@ -2,9 +2,9 @@ using System;
|
|||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region ConstantUse
|
||||
|
||||
|
|
|
@ -2,11 +2,11 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Linq;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
using System.Reflection.Emit;
|
||||
using System.Reflection;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
[Flags]
|
||||
public enum PhpAttributeTargets
|
||||
|
|
|
@ -2,9 +2,9 @@ using System;
|
|||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Direct variable use - a variable or a field accessed by an identifier.
|
||||
|
|
|
@ -3,9 +3,9 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents an <c>echo</c> statement.
|
||||
|
|
|
@ -3,10 +3,10 @@ using System.IO;
|
|||
using System.Runtime.InteropServices;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using PHP.Core.AST;
|
||||
using Pchp.Syntax.Parsers;
|
||||
using Pchp.Syntax.AST;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region enum Operations
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ using System;
|
|||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
using System.Reflection.Emit;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region StaticFieldUse
|
||||
|
||||
|
|
|
@ -6,9 +6,9 @@ using System.Reflection;
|
|||
using System.Diagnostics;
|
||||
using System.Collections;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region FunctionCall
|
||||
|
||||
|
|
|
@ -5,9 +5,9 @@ using System.Reflection.Emit;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region FormalParam
|
||||
|
||||
|
|
|
@ -5,11 +5,11 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core;
|
||||
using PHP.Core.Parsers;
|
||||
using PHP.Core.Text;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.Parsers;
|
||||
using Pchp.Syntax.Text;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region GlobalCode
|
||||
|
||||
|
@ -111,7 +111,7 @@ namespace PHP.Core.AST
|
|||
: base(p)
|
||||
{
|
||||
this.isAnonymous = true;
|
||||
this.qualifiedName = new QualifiedName(Core.Name.EmptyBaseName, Core.Name.EmptyNames);
|
||||
this.qualifiedName = new QualifiedName(Name.EmptyBaseName, Name.EmptyNames);
|
||||
this.IsSimpleSyntax = false;
|
||||
this.naming = new NamingContext(null, null);
|
||||
}
|
||||
|
|
|
@ -3,10 +3,10 @@ using System.Linq;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents an if-statement.
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Post/pre increment/decrement expression.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Indirect variable use - a variable or a field access by run-time evaluated name.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.IO;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region ItemUse
|
||||
|
||||
|
|
|
@ -3,9 +3,9 @@ using System.Reflection.Emit;
|
|||
using System.Diagnostics;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region JumpStmt
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ using System.Reflection;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region LambdaFunctionDecl
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
using System.Diagnostics;
|
||||
using System.Collections.Generic;
|
||||
using PHP.Core.Parsers;
|
||||
using PHP.Core.AST;
|
||||
using PHP.Core;
|
||||
using Pchp.Syntax.Parsers;
|
||||
using Pchp.Syntax.AST;
|
||||
using Pchp.Syntax;
|
||||
using System;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Base class for all AST nodes.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a <c>list</c> construct.
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region Literal
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using PHP.Core;
|
||||
using Pchp.Syntax;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region WhileStmt
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ using System.Diagnostics;
|
|||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region NewEx
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a content of backtick operator (shell command execution).
|
||||
|
|
|
@ -3,9 +3,9 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region Statement
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Reflection.Emit;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region SwitchStmt
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Conditional expression.
|
||||
|
|
|
@ -4,9 +4,9 @@ using System.Diagnostics;
|
|||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents a try-catch statement.
|
||||
|
|
|
@ -6,9 +6,9 @@ using System.Diagnostics;
|
|||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region FormalTypeParam
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@ using System.Diagnostics;
|
|||
using System.Collections.Generic;
|
||||
using System.Reflection;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region TypeRef
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
|
||||
using PHP.Core;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Unary expression.
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
using System;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
#region VariableUse
|
||||
|
||||
|
|
|
@ -2,9 +2,9 @@ using System;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents <c>yield</c> expression for the support for PHP Generator.
|
||||
|
|
|
@ -6,9 +6,7 @@ using System.Collections.Generic;
|
|||
using System.Reflection;
|
||||
using System.Reflection.Emit;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region Enums: WarningGroups, ErrorSeverity
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
#region User Code
|
||||
|
||||
|
@ -10,7 +10,7 @@ namespace PHP.Core.Parsers
|
|||
You must not remove this notice from this software.
|
||||
*/
|
||||
using System;
|
||||
using PHP.Core;
|
||||
using Pchp.Syntax;
|
||||
using System.Collections.Generic;
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ distributed with PHP5 and PHP6 interpreter.
|
|||
*/
|
||||
|
||||
using System.Diagnostics;
|
||||
using PHP.Core;
|
||||
using PHP.Core.AST;
|
||||
using PHP.Core.Parsers.GPPG;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<PHP.Core.AST.TypeRef>, System.Collections.Generic.List<PHP.Core.AST.ActualParam>, System.Collections.Generic.List<PHP.Core.AST.Expression>>;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.AST;
|
||||
using Pchp.Syntax.Parsers.GPPG;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<Pchp.Syntax.AST.TypeRef>, System.Collections.Generic.List<Pchp.Syntax.AST.ActualParam>, System.Collections.Generic.List<Pchp.Syntax.AST.Expression>>;
|
||||
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
public enum Toks {ERROR=127,EOF=128,T_INCLUDE=129,T_INCLUDE_ONCE=130,T_EVAL=131,T_REQUIRE=132,T_REQUIRE_ONCE=133,T_LOGICAL_OR=134,T_LOGICAL_XOR=135,T_LOGICAL_AND=136,T_PRINT=137,T_YIELD=138,T_PLUS_EQUAL=139,T_MINUS_EQUAL=140,T_MUL_EQUAL=141,T_DIV_EQUAL=142,T_CONCAT_EQUAL=143,T_MOD_EQUAL=144,T_AND_EQUAL=145,T_OR_EQUAL=146,T_XOR_EQUAL=147,T_SL_EQUAL=148,T_SR_EQUAL=149,T_POW_EQUAL=150,T_BOOLEAN_OR=151,T_BOOLEAN_AND=152,T_IS_EQUAL=153,T_IS_NOT_EQUAL=154,T_IS_IDENTICAL=155,T_IS_NOT_IDENTICAL=156,T_IS_SMALLER_OR_EQUAL=157,T_IS_GREATER_OR_EQUAL=158,T_SL=159,T_SR=160,T_INC=161,T_DEC=162,TypeCast=163,T_POW=164,T_NEW=165,T_INSTANCEOF=166,T_TYPEOF=167,T_CLONE=168,T_LNUMBER=169,T_L64NUMBER=170,T_DNUMBER=171,T_STRING=172,T_STRING_VARNAME=173,T_VARIABLE=174,T_NUM_STRING=175,T_INLINE_HTML=176,T_CHARACTER=177,T_BAD_CHARACTER=178,T_ENCAPSED_AND_WHITESPACE=179,T_CONSTANT_ENCAPSED_STRING=180,T_EXIT=181,T_IF=182,T_ELSEIF=183,T_ELSE=184,T_ENDIF=185,T_ECHO=186,T_DO=187,T_WHILE=188,T_ENDWHILE=189,T_FOR=190,T_ENDFOR=191,T_FOREACH=192,T_ENDFOREACH=193,T_DECLARE=194,T_ENDDECLARE=195,T_AS=196,T_SWITCH=197,T_ENDSWITCH=198,T_CASE=199,T_DEFAULT=200,T_BREAK=201,T_CONTINUE=202,T_FUNCTION=203,T_CONST=204,T_RETURN=205,T_GLOBAL=206,T_STATIC=207,T_VAR=208,T_UNSET=209,T_ISSET=210,T_EMPTY=211,T_CLASS=212,T_TRAIT=213,T_INSTEADOF=214,T_EXTENDS=215,T_OBJECT_OPERATOR=216,T_DOUBLE_ARROW=217,T_LIST=218,T_ARRAY=219,T_CALLABLE=220,T_CLASS_C=221,T_TRAIT_C=222,T_METHOD_C=223,T_FUNC_C=224,T_LINE=225,T_FILE=226,T_DIR=227,T_COMMENT=228,T_DOC_COMMENT=229,T_PRAGMA_LINE=230,T_PRAGMA_FILE=231,T_PRAGMA_DEFAULT_LINE=232,T_PRAGMA_DEFAULT_FILE=233,T_OPEN_TAG=234,T_OPEN_TAG_WITH_ECHO=235,T_CLOSE_TAG=236,T_WHITESPACE=237,T_START_HEREDOC=238,T_END_HEREDOC=239,T_DOLLAR_OPEN_CURLY_BRACES=240,T_CURLY_OPEN=241,T_DOUBLE_COLON=242,T_MINUS_EQUA=243,T_GOTO=244,T_TRY=245,T_CATCH=246,T_FINALLY=247,T_THROW=248,T_INTERFACE=249,T_IMPLEMENTS=250,T_ABSTRACT=251,T_FINAL=252,T_PRIVATE=253,T_PROTECTED=254,T_PUBLIC=255,T_NAMESPACE=256,T_NAMESPACE_C=257,T_NS_SEPARATOR=258,T_USE=259,T_ELLIPSIS=260,T_BINARY_DOUBLE=261,T_BINARY_HEREDOC=262,T_PARENT=263,T_SELF=264,T_TRUE=265,T_FALSE=266,T_NULL=267,T_GET=268,T_SET=269,T_CALL=270,T_CALLSTATIC=271,T_TOSTRING=272,T_CONSTRUCT=273,T_DESTRUCT=274,T_WAKEUP=275,T_SLEEP=276,T_AUTOLOAD=277,T_PARTIAL=278,T_LGENERIC=279,T_RGENERIC=280,T_IMPORT=281,T_BOOL_TYPE=282,T_INT_TYPE=283,T_INT64_TYPE=284,T_DOUBLE_TYPE=285,T_STRING_TYPE=286,T_RESOURCE_TYPE=287,T_OBJECT_TYPE=288,T_BOOL_CAST=289,T_INT8_CAST=290,T_INT16_CAST=291,T_INT32_CAST=292,T_INT64_CAST=293,T_UINT8_CAST=294,T_UINT16_CAST=295,T_UINT32_CAST=296,T_UINT64_CAST=297,T_DOUBLE_CAST=298,T_FLOAT_CAST=299,T_DECIMAL_CAST=300,T_STRING_CAST=301,T_BINARY_CAST=302,T_UNICODE_CAST=303,T_ARRAY_CAST=304,T_OBJECT_CAST=305,T_UNSET_CAST=306};
|
||||
|
||||
|
|
|
@ -11,13 +11,13 @@
|
|||
*/
|
||||
|
||||
using System;
|
||||
using PHP.Core;
|
||||
using Pchp.Syntax;
|
||||
|
||||
using System.Collections.Generic;
|
||||
|
||||
%%
|
||||
|
||||
%namespace PHP.Core.Parsers
|
||||
%namespace Pchp.Syntax.Parsers
|
||||
%type Tokens
|
||||
%class Lexer
|
||||
%eofval Tokens.EOF
|
||||
|
|
|
@ -9,14 +9,14 @@ distributed with PHP5 and PHP6 interpreter.
|
|||
*/
|
||||
|
||||
using System.Diagnostics;
|
||||
using PHP.Core;
|
||||
using PHP.Core.AST;
|
||||
using PHP.Core.Parsers.GPPG;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<PHP.Core.AST.TypeRef>, System.Collections.Generic.List<PHP.Core.AST.ActualParam>, System.Collections.Generic.List<PHP.Core.AST.Expression>>;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.AST;
|
||||
using Pchp.Syntax.Parsers.GPPG;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<Pchp.Syntax.AST.TypeRef>, System.Collections.Generic.List<Pchp.Syntax.AST.ActualParam>, System.Collections.Generic.List<Pchp.Syntax.AST.Expression>>;
|
||||
|
||||
%%
|
||||
|
||||
%namespace PHP.Core.Parsers
|
||||
%namespace Pchp.Syntax.Parsers
|
||||
%valuetype SemanticValueType
|
||||
%positiontype Text.Span
|
||||
%tokentype Toks
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region InclusionTypes
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region Language Features Enum
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
using System;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region PhpMemberAttributes
|
||||
|
||||
|
|
|
@ -7,9 +7,9 @@ using System.Diagnostics;
|
|||
using System.Threading;
|
||||
using System.Linq;
|
||||
using System.Reflection.Emit;
|
||||
using PHP.Core.Parsers;
|
||||
using Pchp.Syntax.Parsers;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
//
|
||||
// Identifier Representation
|
||||
|
|
|
@ -5,10 +5,10 @@ using System.Linq;
|
|||
using System.Text;
|
||||
using System.IO;
|
||||
|
||||
using PHP.Core.Text;
|
||||
using Pchp.Syntax.Text;
|
||||
using System.Reflection;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
/// <summary>
|
||||
/// Structuralized representation of PHPDoc DocBlock.
|
||||
|
|
|
@ -8,7 +8,7 @@ using System.Globalization;
|
|||
using System.Diagnostics;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
public static class Convert
|
||||
{
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
using PHP.Core.AST;
|
||||
using PHP.Core.Text;
|
||||
using Pchp.Syntax.AST;
|
||||
using Pchp.Syntax.Text;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
/// <summary>
|
||||
/// Helper class containing list of DOC comments during tokenization.
|
||||
|
|
|
@ -25,7 +25,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Parsers.GPPG
|
||||
namespace Pchp.Syntax.Parsers.GPPG
|
||||
{
|
||||
#region State, Rule
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Diagnostics;
|
|||
using System.Text;
|
||||
using System.Globalization;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
#region PhpStringBuilder
|
||||
|
||||
|
@ -107,12 +107,12 @@ namespace PHP.Core.Parsers
|
|||
}
|
||||
}
|
||||
|
||||
public PHP.Core.AST.Literal CreateLiteral()
|
||||
public Pchp.Syntax.AST.Literal CreateLiteral()
|
||||
{
|
||||
if (IsBinary)
|
||||
return new PHP.Core.AST.BinaryStringLiteral(span, BinaryBuilder.ToArray());
|
||||
return new Pchp.Syntax.AST.BinaryStringLiteral(span, BinaryBuilder.ToArray());
|
||||
else
|
||||
return new PHP.Core.AST.StringLiteral(span, UnicodeBuilder.ToString());
|
||||
return new Pchp.Syntax.AST.StringLiteral(span, UnicodeBuilder.ToString());
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
|
@ -5,10 +5,10 @@ using System.IO;
|
|||
using System.Text;
|
||||
using System.Linq;
|
||||
|
||||
using PHP.Core.AST;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<PHP.Core.AST.TypeRef>, System.Collections.Generic.List<PHP.Core.AST.ActualParam>, System.Collections.Generic.List<PHP.Core.AST.Expression>>;
|
||||
using Pchp.Syntax.AST;
|
||||
using FcnParam = System.Tuple<System.Collections.Generic.List<Pchp.Syntax.AST.TypeRef>, System.Collections.Generic.List<Pchp.Syntax.AST.ActualParam>, System.Collections.Generic.List<Pchp.Syntax.AST.Expression>>;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
#region Helpers
|
||||
|
||||
|
|
|
@ -6,11 +6,11 @@ using System.Diagnostics;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
using PHP.Core;
|
||||
using PHP.Core.Parsers.GPPG;
|
||||
using PHP.Core.Text;
|
||||
using Pchp.Syntax;
|
||||
using Pchp.Syntax.Parsers.GPPG;
|
||||
using Pchp.Syntax.Text;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
#region ICommentsSink
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ using System.Diagnostics;
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
public sealed class Tokenizer : Lexer
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
namespace PHP.Core.Parsers
|
||||
namespace Pchp.Syntax.Parsers
|
||||
{
|
||||
public enum TokenCategory
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@ using System.Text;
|
|||
|
||||
using Hashtable = System.Collections.Generic.Dictionary<object, object>;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
/// <summary>
|
||||
/// Provides set of keyed properties.
|
||||
|
|
|
@ -4,11 +4,11 @@ using System.Diagnostics;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
using PHP.Core.Parsers;
|
||||
using PHP.Core.Text;
|
||||
using Pchp.Syntax.Parsers;
|
||||
using Pchp.Syntax.Text;
|
||||
using System.IO;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region SourceUnit
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ using System.Diagnostics;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Text
|
||||
namespace Pchp.Syntax.Text
|
||||
{
|
||||
#region ILineBreaks
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Text
|
||||
namespace Pchp.Syntax.Text
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents text span.
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Text
|
||||
namespace Pchp.Syntax.Text
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents position within text.
|
||||
|
|
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
|||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace PHP.Core.Text
|
||||
namespace Pchp.Syntax.Text
|
||||
{
|
||||
/// <summary>
|
||||
/// Represents span within text.
|
||||
|
|
|
@ -5,7 +5,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
|
||||
namespace PHP.Core.Text
|
||||
namespace Pchp.Syntax.Text
|
||||
{
|
||||
#region TextUtils
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace PHP.Core.AST
|
||||
namespace Pchp.Syntax.AST
|
||||
{
|
||||
/// <summary>
|
||||
/// Class visits recursively each AstNode
|
||||
|
@ -255,7 +255,7 @@ namespace PHP.Core.AST
|
|||
// visits adaptation list
|
||||
var list = x.TraitAdaptationList;
|
||||
if (list != null && list.Any())
|
||||
foreach(PHP.Core.AST.TraitsUse.TraitAdaptation t in list)
|
||||
foreach(Pchp.Syntax.AST.TraitsUse.TraitAdaptation t in list)
|
||||
VisitElement(t);
|
||||
}
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ using System.Collections.Specialized; // case-insensitive hashtable
|
|||
using System.Runtime.Serialization;
|
||||
using System.Reflection;
|
||||
|
||||
namespace PHP.Core
|
||||
namespace Pchp.Syntax
|
||||
{
|
||||
#region Strings
|
||||
|
||||
|
@ -393,7 +393,7 @@ namespace PHP.Core
|
|||
return result;
|
||||
}
|
||||
|
||||
internal static void StringBuilderAppend(PHP.Core.Parsers.PhpStringBuilder/*!*/ dst, StringBuilder/*!*/ src, int startIndex, int length, Text.Span span)
|
||||
internal static void StringBuilderAppend(Pchp.Syntax.Parsers.PhpStringBuilder/*!*/ dst, StringBuilder/*!*/ src, int startIndex, int length, Text.Span span)
|
||||
{
|
||||
dst.Append(src.ToString(startIndex, length), span);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче