Support NRVO in VarDecl regex (#872)

Fixes #802
elliotchance · Jul 28, 2020 · a1651b9 · a1651b9
1 parent 72b29fc
commit a1651b9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/ast/var_decl.go b/ast/var_decl.go
@@ -15,6 +15,7 @@ type VarDecl struct {
 	Type2        string
 	IsExtern     bool
 	IsUsed       bool
+	IsNRVO       bool
 	IsCInit      bool
 	IsReferenced bool
 	IsStatic     bool
@@ -34,6 +35,7 @@ func parseVarDecl(line string) *VarDecl {
 		(?P<type2>:'.*?')?
 		(?P<extern> extern)?
 		(?P<static> static)?
+		(?P<nrvo> nrvo)?
 		(?P<cinit> cinit)?
 		(?P<register> register)?
 		`,
@@ -55,6 +57,7 @@ func parseVarDecl(line string) *VarDecl {
 		Type2:        type2,
 		IsExtern:     len(groups["extern"]) > 0,
 		IsUsed:       len(groups["used"]) > 0,
+		IsNRVO:       len(groups["nrvo"]) > 0,
 		IsCInit:      len(groups["cinit"]) > 0,
 		IsReferenced: len(groups["referenced"]) > 0,
 		IsStatic:     len(groups["static"]) > 0,

diff --git a/ast/var_decl_test.go b/ast/var_decl_test.go
@@ -15,6 +15,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       false,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -31,6 +32,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     true,
 			IsUsed:       false,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -47,6 +49,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "unsigned long",
 			IsExtern:     false,
 			IsUsed:       false,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -63,6 +66,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -79,6 +83,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      true,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -95,6 +100,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       false,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: true,
 			IsStatic:     false,
@@ -111,6 +117,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      true,
 			IsReferenced: false,
 			IsStatic:     true,
@@ -127,6 +134,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "",
 			IsExtern:     false,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -143,6 +151,7 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "extCoord",
 			IsExtern:     false,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      true,
 			IsReferenced: false,
 			IsStatic:     false,
@@ -159,13 +168,30 @@ func TestVarDecl(t *testing.T) {
 			Type2:        "struct cmark_mem",
 			IsExtern:     true,
 			IsUsed:       true,
+			IsNRVO:       false,
 			IsCInit:      false,
 			IsReferenced: false,
 			IsStatic:     false,
 			IsRegister:   false,
 			Parent:       0x7f985e0246d0,
 			ChildNodes:   []Node{},
 		},
+		`0x55d681e87428 <col:5, col:23> col:23 used variable 'union programming':'union programming' nrvo`: &VarDecl{
+			Addr:         0x55d681e87428,
+			Pos:          NewPositionFromString("col:5, col:23"),
+			Position2:    "col:23",
+			Name:         "variable",
+			Type:         "union programming",
+			Type2:        "union programming",
+			IsExtern:     false,
+			IsUsed:       true,
+			IsNRVO:       true,
+			IsCInit:      false,
+			IsReferenced: false,
+			IsStatic:     false,
+			IsRegister:   false,
+			ChildNodes:   []Node{},
+		},
 	}
 
 	runNodeTests(t, nodes)