name nodes
This commit is contained in:
parent
347cb09386
commit
829326f8f7
@ -1,3 +1,2 @@
|
||||
<? $a = 'test
|
||||
$a test
|
||||
test';
|
||||
<?
|
||||
namespace \foo\bar\baz;
|
18
node/name/fully_qualified.go
Normal file
18
node/name/fully_qualified.go
Normal file
@ -0,0 +1,18 @@
|
||||
package name
|
||||
|
||||
import (
|
||||
"github.com/z7zmey/php-parser/node"
|
||||
)
|
||||
|
||||
type FullyQualified struct {
|
||||
Name
|
||||
}
|
||||
|
||||
func NewFullyQualified(parts []node.Node) node.Node {
|
||||
return FullyQualified{
|
||||
Name{
|
||||
node.SimpleNode{Name: "FullyQualifiedName", Attributes: make(map[string]string)},
|
||||
parts,
|
||||
},
|
||||
}
|
||||
}
|
27
node/name/name.go
Normal file
27
node/name/name.go
Normal file
@ -0,0 +1,27 @@
|
||||
package name
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/z7zmey/php-parser/node"
|
||||
"io"
|
||||
)
|
||||
|
||||
type Name struct {
|
||||
node.SimpleNode
|
||||
parts []node.Node
|
||||
}
|
||||
|
||||
func NewName(parts []node.Node) node.Node {
|
||||
return Name{
|
||||
node.SimpleNode{Name: "Name", Attributes: make(map[string]string)},
|
||||
parts,
|
||||
}
|
||||
}
|
||||
|
||||
func (n Name) Print(out io.Writer, indent string) {
|
||||
fmt.Fprintf(out, "\n%v%v", indent, n.Name)
|
||||
fmt.Fprintf(out, "\n%vparts:", indent+" ",)
|
||||
for _, nn := range n.parts {
|
||||
nn.Print(out, indent+" ")
|
||||
}
|
||||
}
|
27
node/name/name_part.go
Normal file
27
node/name/name_part.go
Normal file
@ -0,0 +1,27 @@
|
||||
package name
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/z7zmey/php-parser/token"
|
||||
"github.com/z7zmey/php-parser/node"
|
||||
"io"
|
||||
)
|
||||
|
||||
type NamePart struct {
|
||||
node.SimpleNode
|
||||
token token.Token
|
||||
}
|
||||
|
||||
func NewNamePart(token token.Token) node.Node {
|
||||
return NamePart{
|
||||
node.SimpleNode{Name: "NamePart", Attributes: make(map[string]string)},
|
||||
token,
|
||||
}
|
||||
}
|
||||
|
||||
func (n NamePart) Print(out io.Writer, indent string) {
|
||||
fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value)
|
||||
for _, nn := range n.Children {
|
||||
nn.Print(out, indent+" ")
|
||||
}
|
||||
}
|
19
node/name/relative.go
Normal file
19
node/name/relative.go
Normal file
@ -0,0 +1,19 @@
|
||||
package name
|
||||
|
||||
import (
|
||||
"github.com/z7zmey/php-parser/node"
|
||||
)
|
||||
|
||||
type Relative struct {
|
||||
Name
|
||||
}
|
||||
|
||||
func NewRelative(parts []node.Node) node.Node {
|
||||
return Relative{
|
||||
Name{
|
||||
node.SimpleNode{Name: "RelativeName", Attributes: make(map[string]string)},
|
||||
parts,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
1287
parser/parser.go
1287
parser/parser.go
File diff suppressed because it is too large
Load Diff
@ -6,6 +6,7 @@ import (
|
||||
"github.com/z7zmey/php-parser/token"
|
||||
"github.com/z7zmey/php-parser/node"
|
||||
"github.com/z7zmey/php-parser/node/scalar"
|
||||
"github.com/z7zmey/php-parser/node/name"
|
||||
)
|
||||
|
||||
var rootnode = node.NewSimpleNode("Root")
|
||||
@ -173,7 +174,7 @@ func Parse(src io.Reader, fName string) node.Node {
|
||||
%type <token> reserved_non_modifiers
|
||||
%type <token> semi_reserved
|
||||
|
||||
%type <node> top_statement namespace_name name statement function_declaration_statement
|
||||
%type <node> top_statement name statement function_declaration_statement
|
||||
%type <node> class_declaration_statement trait_declaration_statement
|
||||
%type <node> interface_declaration_statement interface_extends_list
|
||||
%type <node> group_use_declaration inline_use_declarations inline_use_declaration
|
||||
@ -206,7 +207,7 @@ func Parse(src io.Reader, fName string) node.Node {
|
||||
%type <node> method_modifiers non_empty_member_modifiers member_modifier
|
||||
%type <node> class_modifiers use_type
|
||||
|
||||
%type <list> encaps_list backticks_expr
|
||||
%type <list> encaps_list backticks_expr namespace_name
|
||||
|
||||
%%
|
||||
|
||||
@ -242,14 +243,14 @@ top_statement_list:
|
||||
;
|
||||
|
||||
namespace_name:
|
||||
T_STRING { $$ = node.NewSimpleNode("NamespaceParts").Append(node.TokenNode("NsPart", $1)); }
|
||||
| namespace_name T_NS_SEPARATOR T_STRING { $$ = $1.Append(node.TokenNode("NsPart", $3)); }
|
||||
T_STRING { $$ = []node.Node{name.NewNamePart($1)} }
|
||||
| namespace_name T_NS_SEPARATOR T_STRING { $$ = append($1, name.NewNamePart($3)) }
|
||||
;
|
||||
|
||||
name:
|
||||
namespace_name { $$ = node.NewSimpleNode("Name").Append($1); }
|
||||
| T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = node.NewSimpleNode("Name").Append($3).Attribute("Relative", "true"); }
|
||||
| T_NS_SEPARATOR namespace_name { $$ = node.NewSimpleNode("Name").Append($2).Attribute("FullyQualified", "true"); }
|
||||
namespace_name { $$ = name.NewName($1) }
|
||||
| T_NAMESPACE T_NS_SEPARATOR namespace_name { $$ = name.NewRelative($3) }
|
||||
| T_NS_SEPARATOR namespace_name { $$ = name.NewFullyQualified($2) }
|
||||
;
|
||||
|
||||
top_statement:
|
||||
@ -259,9 +260,9 @@ top_statement:
|
||||
| trait_declaration_statement { $$ = $1; }
|
||||
| interface_declaration_statement { $$ = $1; }
|
||||
| T_HALT_COMPILER '(' ')' ';' { $$ = node.NewSimpleNode("THaltCompiler") }
|
||||
| T_NAMESPACE namespace_name ';' { $$ = node.NewSimpleNode("Namespace").Append($2); }
|
||||
| T_NAMESPACE namespace_name ';' { $$ = node.NewSimpleNode("Namespace").Append(name.NewName($2)); }
|
||||
| T_NAMESPACE namespace_name '{' top_statement_list '}'
|
||||
{ $$ = node.NewSimpleNode("Namespace").Append($2).Append($4) }
|
||||
{ $$ = node.NewSimpleNode("Namespace").Append(name.NewName($2)).Append($4) }
|
||||
| T_NAMESPACE '{' top_statement_list '}' { $$ = node.NewSimpleNode("Namespace").Append($3) }
|
||||
| T_USE mixed_group_use_declaration ';' { $$ = $2; }
|
||||
| T_USE use_type group_use_declaration ';' { $$ = $3.Append($2) }
|
||||
@ -277,16 +278,16 @@ use_type:
|
||||
|
||||
group_use_declaration:
|
||||
namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
|
||||
{ $$ = node.NewSimpleNode("GroupUse").Append($1).Append($4) }
|
||||
{ $$ = node.NewSimpleNode("GroupUse").Append(name.NewName($1)).Append($4) }
|
||||
| T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations possible_comma '}'
|
||||
{ $$ = node.NewSimpleNode("GroupUse").Append($2).Append($5) }
|
||||
{ $$ = node.NewSimpleNode("GroupUse").Append(name.NewName($2)).Append($5) }
|
||||
;
|
||||
|
||||
mixed_group_use_declaration:
|
||||
namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}'
|
||||
{ $$ = node.NewSimpleNode("MixedGroupUse").Append($1).Append($4); }
|
||||
{ $$ = node.NewSimpleNode("MixedGroupUse").Append(name.NewName($1)).Append($4); }
|
||||
| T_NS_SEPARATOR namespace_name T_NS_SEPARATOR '{' inline_use_declarations possible_comma '}'
|
||||
{ $$ = node.NewSimpleNode("MixedGroupUse").Append($2).Append($5); }
|
||||
{ $$ = node.NewSimpleNode("MixedGroupUse").Append(name.NewName($2)).Append($5); }
|
||||
;
|
||||
|
||||
possible_comma:
|
||||
@ -317,8 +318,8 @@ inline_use_declaration:
|
||||
;
|
||||
|
||||
unprefixed_use_declaration:
|
||||
namespace_name { $$ = node.NewSimpleNode("UseElem").Append($1); }
|
||||
| namespace_name T_AS T_STRING { $$ = node.NewSimpleNode("UseElem").Append($1).Append(node.NewSimpleNode("as").Attribute("value", $3.String())); }
|
||||
namespace_name { $$ = node.NewSimpleNode("UseElem").Append(name.NewName($1)); }
|
||||
| namespace_name T_AS T_STRING { $$ = node.NewSimpleNode("UseElem").Append(name.NewName($1)).Append(node.NewSimpleNode("as").Attribute("value", $3.String())); }
|
||||
;
|
||||
|
||||
use_declaration:
|
||||
|
Loading…
Reference in New Issue
Block a user