Don't automatically hide singleton nodes

This commit is contained in:
Max Brunsfeld 2015-09-02 16:36:29 -07:00
parent acf9280eda
commit 53926c467e
21 changed files with 4284 additions and 4221 deletions

View file

@ -16,7 +16,7 @@ x + (y * + z) * 5
---
(sum
(program (sum
(variable)
(product
(group (ERROR (variable) (UNEXPECTED '+') (variable))) (number)))
(group (ERROR (variable) (UNEXPECTED '+') (variable))) (number))))

View file

@ -6,7 +6,7 @@ numbers
---
(number)
(program (number))
===================
variables
@ -16,7 +16,7 @@ x
---
(variable)
(program (variable))
====================================
variables with greek letters
@ -26,7 +26,7 @@ variables with greek letters
---
(variable)
(program (variable))
===================
products
@ -36,7 +36,7 @@ x * x
---
(product (variable) (variable))
(program (product (variable) (variable)))
===================
sums
@ -46,7 +46,7 @@ x + x
---
(sum (variable) (variable))
(program (sum (variable) (variable)))
===============================================
operators of different precedence
@ -56,9 +56,9 @@ a * b + c * d
---
(sum
(program (sum
(product (variable) (variable))
(product (variable) (variable)))
(product (variable) (variable))))
============================
exponents
@ -68,10 +68,10 @@ x + y * z^(a + b)
---
(sum
(program (sum
(variable)
(product
(variable)
(exponent
(variable)
(group (sum (variable) (variable))))))
(group (sum (variable) (variable)))))))

View file

@ -6,7 +6,8 @@ int x;
---
(declaration (identifier) (identifier))
(program
(declaration (type_name (identifier)) (declarator (identifier))))
==========================================
simple functions
@ -17,25 +18,27 @@ int main() {
---
(function_definition
(identifier) (direct_declarator (identifier))
(compound_statement))
(program (function_definition
(type_name (identifier))
(declarator (identifier))
(compound_statement)))
==========================================
ambiguous declarations
==========================================
int main() {
int i;
someTypeOrValue * pointerOrMultiplicand();
float y;
int i;
someTypeOrValue * pointerOrMultiplicand();
float y;
}
---
(function_definition
(identifier) (direct_declarator (identifier))
(program (function_definition
(type_name (identifier))
(declarator (identifier))
(compound_statement
(declaration (identifier) (identifier))
(declaration (identifier) (declarator (pointer) (direct_declarator (identifier))))
(declaration (identifier) (identifier))))
(declaration (type_name (identifier)) (declarator (identifier)))
(declaration (type_name (identifier)) (declarator (pointer) (identifier)))
(declaration (type_name (identifier)) (declarator (identifier))))))

View file

@ -48,5 +48,5 @@ func main() {
(program
(package_directive (package_name))
(var_declaration (var_name) (expression (number) (comment)))
(var_declaration (var_name) (number) (comment))
(func_declaration (var_name) (block_statement (comment))))

View file

@ -10,6 +10,6 @@ package trivial
---
(program
(package_directive (package_name))
(func_declaration (var_name) (block_statement))
(func_declaration (var_name) (block_statement)))
(package_directive (package_name))
(func_declaration (var_name) (block_statement))
(func_declaration (var_name) (block_statement)))

View file

@ -5,17 +5,17 @@ function calls
package main
func main() {
println("1", 2)
println()
println("1", 2)
println()
}
---
(program
(package_directive (package_name))
(func_declaration (var_name) (block_statement
(expression_statement (call_expression (var_name) (string) (number)))
(expression_statement (call_expression (var_name))))))
(package_directive (package_name))
(func_declaration (var_name) (block_statement
(expression_statement (call_expression (var_name) (string) (number)))
(expression_statement (call_expression (var_name))))))
============================================
selector expressions
@ -24,16 +24,15 @@ selector expressions
package main
func main() {
x.SomeMethod(x.SomeField, x.OtherField.NestedField);
x.SomeMethod(x.SomeField, x.OtherField.NestedField);
}
---
(program
(package_directive (package_name))
(func_declaration (var_name) (block_statement
(expression_statement (call_expression
(selector_expression (var_name) (var_name))
(selector_expression (var_name) (var_name))
(selector_expression (selector_expression (var_name) (var_name)) (var_name)))))))
(package_directive (package_name))
(func_declaration (var_name) (block_statement
(expression_statement (call_expression
(selector_expression (var_name) (var_name))
(selector_expression (var_name) (var_name))
(selector_expression (selector_expression (var_name) (var_name)) (var_name)))))))

View file

@ -14,10 +14,10 @@ func helper() {
---
(program (package_directive (package_name))
(func_declaration (var_name) (block_statement
(return_statement)))
(func_declaration (var_name) (block_statement
(return_statement (number) (var_name) (string)))))
(func_declaration (var_name) (block_statement
(return_statement)))
(func_declaration (var_name) (block_statement
(return_statement (number) (var_name) (string)))))
============================================
variable declarations
@ -34,10 +34,10 @@ func main() {
---
(program (package_directive (package_name))
(func_declaration (var_name) (block_statement
(declaration_statement (var_name) (var_name) (call_expression (var_name)))
(var_declaration (var_name) (number))
(expression_statement (call_expression (var_name) (var_name) (var_name) (var_name))))))
(func_declaration (var_name) (block_statement
(short_var_declaration (var_name) (var_name) (call_expression (var_name)))
(var_declaration (var_name) (number))
(expression_statement (call_expression (var_name) (var_name) (var_name) (var_name))))))
============================================
if statements
@ -46,30 +46,30 @@ if statements
package main
func main() {
if condition1() {
}
if condition1() {
}
if condition2() {
} else {
}
if condition2() {
} else {
}
if condition3() {
} else if condition4() {
}
if condition3() {
} else if condition4() {
}
}
---
(program (package_directive (package_name))
(func_declaration (var_name) (block_statement
(func_declaration (var_name) (block_statement
(if_statement (call_expression (var_name))
(block_statement))
(if_statement (call_expression (var_name))
(block_statement) (block_statement))
(if_statement (call_expression (var_name))
(block_statement)
(if_statement (call_expression (var_name))
(block_statement))
(if_statement (call_expression (var_name))
(block_statement) (block_statement))
(if_statement (call_expression (var_name))
(block_statement)
(if_statement (call_expression (var_name))
(block_statement))))))
(block_statement))))))
=============================================
range statements
@ -90,8 +90,8 @@ func main() {
---
(program (package_directive (package_name))
(func_declaration (var_name) (block_statement
(range_statement (var_name) (call_expression (var_name)) (block_statement
(expression_statement (call_expression (var_name) (var_name)))))
(range_statement (var_name) (var_name) (call_expression (var_name)) (block_statement
(expression_statement (call_expression (var_name) (var_name) (var_name))))))))
(func_declaration (var_name) (block_statement
(range_statement (var_name) (call_expression (var_name)) (block_statement
(expression_statement (call_expression (var_name) (var_name)))))
(range_statement (var_name) (var_name) (call_expression (var_name)) (block_statement
(expression_statement (call_expression (var_name) (var_name) (var_name))))))))

View file

@ -5,21 +5,21 @@ composite types
package main
type x *struct {
field1 []int64
field2 map[string]interface{
DoStuff()
}
field1 []int64
field2 map[string]interface{
DoStuff()
}
}
---
(program
(package_directive (package_name))
(type_declaration
(type_name)
(pointer_type (struct_type
(var_name) (slice_type (type_name))
(var_name) (map_type (type_name) (interface_type (var_name)))))))
(package_directive (package_name))
(type_declaration
(type_name)
(pointer_type (struct_type
(var_name) (slice_type (type_name))
(var_name) (map_type (type_name) (interface_type (var_name)))))))
============================================
functions arguments
@ -34,10 +34,10 @@ func argsOfDifferentTypes() (arg1 string, arg2 int64) {}
---
(program
(package_directive (package_name))
(func_declaration (var_name) (var_name) (interface_type) (block_statement))
(func_declaration (var_name) (var_name) (var_name) (type_name) (block_statement))
(func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (block_statement)))
(package_directive (package_name))
(func_declaration (var_name) (var_name) (interface_type) (block_statement))
(func_declaration (var_name) (var_name) (var_name) (type_name) (block_statement))
(func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (block_statement)))
============================================
functions with unnamed return values
@ -51,11 +51,11 @@ func multipleReturnValues() (string, int64, error) {}
---
(program
(package_directive (package_name))
(func_declaration (var_name) (type_name)
(block_statement))
(func_declaration (var_name) (type_name) (type_name) (type_name)
(block_statement)))
(package_directive (package_name))
(func_declaration (var_name) (type_name)
(block_statement))
(func_declaration (var_name) (type_name) (type_name) (type_name)
(block_statement)))
============================================
functions with named return values
@ -69,9 +69,8 @@ func multipleReturnValues() (result string, count int64, err error) {}
---
(program
(package_directive (package_name))
(func_declaration (var_name) (var_name) (type_name)
(block_statement))
(func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (var_name) (type_name)
(block_statement)))
(package_directive (package_name))
(func_declaration (var_name) (var_name) (type_name)
(block_statement))
(func_declaration (var_name) (var_name) (type_name) (var_name) (type_name) (var_name) (type_name)
(block_statement)))