Skip to content

Commit

Permalink
Fix a bug in templates causing nilNode to not implement the base node…
Browse files Browse the repository at this point in the history 
…. Make NilNode exported.
  • Loading branch information
@inspirer
inspirer committed Nov 11, 2018
1 parent d2e9e4d commit 973a0cd
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 54 deletions.
8 changes: 4 additions & 4 deletions tm-go/parsers/test/ast/ast.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ type Token struct {
Node
}

type nilNode struct{}
type NilNode struct{}

var nilInstance = &nilNode{}
var nilInstance = &NilNode{}

// All types implement TestNode.
func (n Block) TestNode() Node { return n.Node }
Expand All @@ -43,7 +43,7 @@ func (n Int) TestNode() Node { return n.Node }
func (n Negation) TestNode() Node { return n.Node }
func (n Test) TestNode() Node { return n.Node }
func (n Token) TestNode() Node { return n.Node }
func (nilNode) TestNode() Node { return nil }
func (NilNode) TestNode() Node { return nil }

type Declaration interface {
TestNode
Expand All @@ -57,7 +57,7 @@ func (Block) declarationNode() {}
func (Decl1) declarationNode() {}
func (Decl2) declarationNode() {}
func (Int) declarationNode() {}
func (nilNode) declarationNode() {}
func (NilNode) declarationNode() {}

// Types.

Expand Down
56 changes: 28 additions & 28 deletions tm-parsers/js/ast/ast.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ type Token struct {
*Node
}

type nilNode struct{}
type NilNode struct{}

var nilInstance = &nilNode{}
var nilInstance = &NilNode{}

// All types implement JsNode.
func (n Abstract) JsNode() *Node { return n.Node }
Expand Down Expand Up @@ -224,7 +224,7 @@ func (n WhileStatement) JsNode() *Node { return n.Node }
func (n WithStatement) JsNode() *Node { return n.Node }
func (n Yield) JsNode() *Node { return n.Node }
func (n Token) JsNode() *Node { return n.Node }
func (nilNode) JsNode() *Node { return nil }
func (NilNode) JsNode() *Node { return nil }

type BindingPattern interface {
JsNode
Expand All @@ -236,7 +236,7 @@ type BindingPattern interface {
//
func (ArrayPattern) bindingPatternNode() {}
func (ObjectPattern) bindingPatternNode() {}
func (nilNode) bindingPatternNode() {}
func (NilNode) bindingPatternNode() {}

type CaseClause interface {
JsNode
Expand All @@ -248,7 +248,7 @@ type CaseClause interface {
//
func (Case) caseClauseNode() {}
func (Default) caseClauseNode() {}
func (nilNode) caseClauseNode() {}
func (NilNode) caseClauseNode() {}

type ClassElement interface {
JsNode
Expand All @@ -262,7 +262,7 @@ func (EmptyDecl) classElementNode() {}
func (MemberMethod) classElementNode() {}
func (MemberVar) classElementNode() {}
func (TsIndexMemberDeclaration) classElementNode() {}
func (nilNode) classElementNode() {}
func (NilNode) classElementNode() {}

type Declaration interface {
JsNode
Expand Down Expand Up @@ -291,7 +291,7 @@ func (TsImportAliasDeclaration) declarationNode() {}
func (TsInterface) declarationNode() {}
func (TsNamespace) declarationNode() {}
func (TypeAliasDeclaration) declarationNode() {}
func (nilNode) declarationNode() {}
func (NilNode) declarationNode() {}

type Decorator interface {
JsNode
Expand All @@ -303,7 +303,7 @@ type Decorator interface {
//
func (DecoratorCall) decoratorNode() {}
func (DecoratorExpr) decoratorNode() {}
func (nilNode) decoratorNode() {}
func (NilNode) decoratorNode() {}

type ElementPattern interface {
JsNode
Expand All @@ -316,7 +316,7 @@ type ElementPattern interface {
func (ElementBinding) elementPatternNode() {}
func (SingleNameBinding) elementPatternNode() {}
func (SyntaxProblem) elementPatternNode() {}
func (nilNode) elementPatternNode() {}
func (NilNode) elementPatternNode() {}

type ExportElement interface {
JsNode
Expand All @@ -328,7 +328,7 @@ type ExportElement interface {
//
func (ExportSpecifier) exportElementNode() {}
func (SyntaxProblem) exportElementNode() {}
func (nilNode) exportElementNode() {}
func (NilNode) exportElementNode() {}

type Expression interface {
JsNode
Expand Down Expand Up @@ -386,7 +386,7 @@ func (TsDynamicImport) expressionNode() {}
func (TsNonNull) expressionNode() {}
func (UnaryExpression) expressionNode() {}
func (Yield) expressionNode() {}
func (nilNode) expressionNode() {}
func (NilNode) expressionNode() {}

type JSXAttribute interface {
JsNode
Expand All @@ -398,7 +398,7 @@ type JSXAttribute interface {
//
func (JSXNormalAttribute) jSXAttributeNode() {}
func (JSXSpreadAttribute) jSXAttributeNode() {}
func (nilNode) jSXAttributeNode() {}
func (NilNode) jSXAttributeNode() {}

type JSXAttributeValue interface {
JsNode
Expand All @@ -411,7 +411,7 @@ type JSXAttributeValue interface {
func (JSXElement) jSXAttributeValueNode() {}
func (JSXExpression) jSXAttributeValueNode() {}
func (JSXLiteral) jSXAttributeValueNode() {}
func (nilNode) jSXAttributeValueNode() {}
func (NilNode) jSXAttributeValueNode() {}

type JSXChild interface {
JsNode
Expand All @@ -425,7 +425,7 @@ func (JSXElement) jSXChildNode() {}
func (JSXExpression) jSXChildNode() {}
func (JSXSpreadExpression) jSXChildNode() {}
func (JSXText) jSXChildNode() {}
func (nilNode) jSXChildNode() {}
func (NilNode) jSXChildNode() {}

type MethodDefinition interface {
JsNode
Expand All @@ -440,7 +440,7 @@ func (GeneratorMethod) methodDefinitionNode() {}
func (Getter) methodDefinitionNode() {}
func (Method) methodDefinitionNode() {}
func (Setter) methodDefinitionNode() {}
func (nilNode) methodDefinitionNode() {}
func (NilNode) methodDefinitionNode() {}

type Modifier interface {
JsNode
Expand All @@ -456,7 +456,7 @@ func (DecoratorCall) modifierNode() {}
func (DecoratorExpr) modifierNode() {}
func (Readonly) modifierNode() {}
func (Static) modifierNode() {}
func (nilNode) modifierNode() {}
func (NilNode) modifierNode() {}

type ModuleItem interface {
JsNode
Expand Down Expand Up @@ -514,7 +514,7 @@ func (TypeAliasDeclaration) moduleItemNode() {}
func (VariableStatement) moduleItemNode() {}
func (WhileStatement) moduleItemNode() {}
func (WithStatement) moduleItemNode() {}
func (nilNode) moduleItemNode() {}
func (NilNode) moduleItemNode() {}

type NamedImport interface {
JsNode
Expand All @@ -526,7 +526,7 @@ type NamedImport interface {
//
func (ImportSpecifier) namedImportNode() {}
func (SyntaxProblem) namedImportNode() {}
func (nilNode) namedImportNode() {}
func (NilNode) namedImportNode() {}

type Parameter interface {
JsNode
Expand All @@ -540,7 +540,7 @@ func (DefaultParameter) parameterNode() {}
func (RestParameter) parameterNode() {}
func (SyntaxProblem) parameterNode() {}
func (TsThisParameter) parameterNode() {}
func (nilNode) parameterNode() {}
func (NilNode) parameterNode() {}

type PropertyDefinition interface {
JsNode
Expand All @@ -555,7 +555,7 @@ func (Property) propertyDefinitionNode() {}
func (ShorthandProperty) propertyDefinitionNode() {}
func (SpreadProperty) propertyDefinitionNode() {}
func (SyntaxProblem) propertyDefinitionNode() {}
func (nilNode) propertyDefinitionNode() {}
func (NilNode) propertyDefinitionNode() {}

type PropertyName interface {
JsNode
Expand All @@ -567,7 +567,7 @@ type PropertyName interface {
//
func (ComputedPropertyName) propertyNameNode() {}
func (LiteralPropertyName) propertyNameNode() {}
func (nilNode) propertyNameNode() {}
func (NilNode) propertyNameNode() {}

type PropertyPattern interface {
JsNode
Expand All @@ -580,7 +580,7 @@ type PropertyPattern interface {
func (PropertyBinding) propertyPatternNode() {}
func (SingleNameBinding) propertyPatternNode() {}
func (SyntaxProblem) propertyPatternNode() {}
func (nilNode) propertyPatternNode() {}
func (NilNode) propertyPatternNode() {}

type Statement interface {
JsNode
Expand Down Expand Up @@ -612,7 +612,7 @@ func (TryStatement) statementNode() {}
func (VariableStatement) statementNode() {}
func (WhileStatement) statementNode() {}
func (WithStatement) statementNode() {}
func (nilNode) statementNode() {}
func (NilNode) statementNode() {}

type StatementListItem interface {
JsNode
Expand Down Expand Up @@ -664,7 +664,7 @@ func (TypeAliasDeclaration) statementListItemNode() {}
func (VariableStatement) statementListItemNode() {}
func (WhileStatement) statementListItemNode() {}
func (WithStatement) statementListItemNode() {}
func (nilNode) statementListItemNode() {}
func (NilNode) statementListItemNode() {}

type TsAmbientClassElement interface {
JsNode
Expand All @@ -677,7 +677,7 @@ type TsAmbientClassElement interface {
func (TsAmbientFunctionMember) tsAmbientClassElementNode() {}
func (TsAmbientIndexMember) tsAmbientClassElementNode() {}
func (TsAmbientPropertyMember) tsAmbientClassElementNode() {}
func (nilNode) tsAmbientClassElementNode() {}
func (NilNode) tsAmbientClassElementNode() {}

type TsAmbientElement interface {
JsNode
Expand All @@ -696,7 +696,7 @@ func (TsAmbientModule) tsAmbientElementNode() {}
func (TsAmbientNamespace) tsAmbientElementNode() {}
func (TsAmbientTypeAlias) tsAmbientElementNode() {}
func (TsAmbientVar) tsAmbientElementNode() {}
func (nilNode) tsAmbientElementNode() {}
func (NilNode) tsAmbientElementNode() {}

type TsType interface {
JsNode
Expand All @@ -723,7 +723,7 @@ func (TypePredicate) tsTypeNode() {}
func (TypeQuery) tsTypeNode() {}
func (TypeReference) tsTypeNode() {}
func (UnionType) tsTypeNode() {}
func (nilNode) tsTypeNode() {}
func (NilNode) tsTypeNode() {}

type TypeMember interface {
JsNode
Expand All @@ -738,7 +738,7 @@ func (ConstructSignature) typeMemberNode() {}
func (IndexSignature) typeMemberNode() {}
func (MethodSignature) typeMemberNode() {}
func (PropertySignature) typeMemberNode() {}
func (nilNode) typeMemberNode() {}
func (NilNode) typeMemberNode() {}

// Types.

Expand Down
Loading

0 comments on commit 973a0cd

Please sign in to comment.