Making CTagsParser aware of functions in struct, and filtering them out.

Federico Fissore · Federico Fissore · commit 0379be027500 · 2015-09-15T16:35:15.000+02:00
Also moving all ctags test outputs in separate files, for easier maintenance Fixes #5 Signed-off-by: Federico Fissore <f.fissore@arduino.cc>
diff --git a/src/arduino.cc/builder/ctags_parser.go b/src/arduino.cc/builder/ctags_parser.go
@@ -43,12 +43,13 @@ const FIELD_RETURNTYPE = "returntype"
 const FIELD_CODE = "code"
 const FIELD_FUNCTION_NAME = "functionName"
 const FIELD_CLASS = "class"
+const FIELD_STRUCT = "struct"
 
 const KIND_PROTOTYPE = "prototype"
 
 const TEMPLATE = "template"
 
-var FIELDS = map[string]bool{"kind": true, "line": true, "typeref": true, "signature": true, "returntype": true, "class": true}
+var FIELDS = map[string]bool{"kind": true, "line": true, "typeref": true, "signature": true, "returntype": true, "class": true, "struct": true}
 var KNOWN_TAG_KINDS = map[string]bool{"prototype": true, "function": true}
 
 type CTagsParser struct {
@@ -66,7 +67,8 @@ func (s *CTagsParser) Run(context map[string]interface{}) error {
 	}
 
 	tags = filterOutUnknownTags(tags)
-	tags = filterOutTagsWithClass(tags)
+	tags = filterOutTagsWithField(tags, FIELD_CLASS)
+	tags = filterOutTagsWithField(tags, FIELD_STRUCT)
 	tags = addPrototypes(tags)
 	tags = removeDefinedProtypes(tags)
 	tags = removeDuplicate(tags)
@@ -140,10 +142,10 @@ func removeDuplicate(tags []map[string]string) []map[string]string {
 	return newTags
 }
 
-func filterOutTagsWithClass(tags []map[string]string) []map[string]string {
+func filterOutTagsWithField(tags []map[string]string, field string) []map[string]string {
 	var newTags []map[string]string
 	for _, tag := range tags {
-		if tag[FIELD_CLASS] == constants.EMPTY_STRING {
+		if tag[field] == constants.EMPTY_STRING {
 			newTags = append(newTags, tag)
 		}
 	}
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserClassMembersAreFilteredOut.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserClassMembersAreFilteredOut.txt
@@ -0,0 +1,6 @@
+set_values	/tmp/test834438754/preproc/ctags_target.cpp	/^    void set_values (int,int);$/;"	kind:prototype	line:5	class:Rectangle	signature:(int,int)	returntype:void
+area	/tmp/test834438754/preproc/ctags_target.cpp	/^    int area() {return width*height;}$/;"	kind:function	line:6	class:Rectangle	signature:()	returntype:int
+set_values	/tmp/test834438754/preproc/ctags_target.cpp	/^void Rectangle::set_values (int x, int y) {$/;"	kind:function	line:9	class:Rectangle	signature:(int x, int y)	returntype:void
+setup	/tmp/test834438754/preproc/ctags_target.cpp	/^void setup() {$/;"	kind:function	line:14	signature:()	returntype:void
+loop	/tmp/test834438754/preproc/ctags_target.cpp	/^void loop() {$/;"	kind:function	line:18	signature:()	returntype:void
+
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt
@@ -0,0 +1,3 @@
+getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^ void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;$/;"	kind:prototype	line:4330	signature:(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const	returntype:void
+getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^boolean getBytes( byte addr, int amount ) // updates the byte array "received" with the given amount of bytes, read from the given address$/;"	kind:function	line:5031	signature:( byte addr, int amount )	returntype:boolean
+getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^boolean getBytes( byte addr, int amount ) // updates the byte array "received" with the given amount of bytes, read from the given address$/;"	kind:function	line:214	signature:( byte addr, int amount )	returntype:boolean
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithClasses.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithClasses.txt
@@ -0,0 +1,2 @@
+SleepCycle	/tmp/sketch9043227824785312266.cpp	/^        SleepCycle( const char* name );$/;"	kind:prototype	line:4	signature:( const char* name )
+SleepCycle	/tmp/sketch9043227824785312266.cpp	/^    SleepCycle::SleepCycle( const char* name )$/;"	kind:function	line:8	signature:( const char* name )
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithMacros.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithMacros.txt
@@ -0,0 +1,8 @@
+DEBUG	/tmp/sketch5976699731718729500.cpp	1;"	kind:macro	line:1
+DISABLED	/tmp/sketch5976699731718729500.cpp	2;"	kind:macro	line:2
+hello	/tmp/sketch5976699731718729500.cpp	/^String hello = "world!";$/;"	kind:variable	line:16
+setup	/tmp/sketch5976699731718729500.cpp	/^void setup() {$/;"	kind:function	line:18	signature:()	returntype:void
+loop	/tmp/sketch5976699731718729500.cpp	/^void loop() {$/;"	kind:function	line:23	signature:()	returntype:void
+debug	/tmp/sketch5976699731718729500.cpp	/^void debug() {$/;"	kind:function	line:35	signature:()	returntype:void
+disabledIsDefined	/tmp/sketch5976699731718729500.cpp	/^void disabledIsDefined() {$/;"	kind:function	line:46	signature:()	returntype:void
+useMyType	/tmp/sketch5976699731718729500.cpp	/^int useMyType(MyType type) {$/;"	kind:function	line:50	signature:(MyType type)	returntype:int
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithStructs.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldDealWithStructs.txt
@@ -0,0 +1,5 @@
+A_NEW_TYPE	/tmp/sketch8930345717354294915.cpp	/^struct A_NEW_TYPE {$/;"	kind:struct	line:3
+foo	/tmp/sketch8930345717354294915.cpp	/^} foo;$/;"	kind:variable	line:7	typeref:struct:A_NEW_TYPE
+setup	/tmp/sketch8930345717354294915.cpp	/^void setup() {$/;"	kind:function	line:9	signature:()	returntype:void
+loop	/tmp/sketch8930345717354294915.cpp	/^void loop() {$/;"	kind:function	line:13	signature:()	returntype:void
+dostuff	/tmp/sketch8930345717354294915.cpp	/^void dostuff (A_NEW_TYPE * bar)$/;"	kind:function	line:17	signature:(A_NEW_TYPE * bar)	returntype:void
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListPrototypes.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListPrototypes.txt
@@ -0,0 +1,8 @@
+server	/tmp/sketch7210316334309249705.cpp	/^YunServer server;$/;"	kind:variable	line:31
+setup	/tmp/sketch7210316334309249705.cpp	/^void setup() {$/;"	kind:function	line:33	signature:()	returntype:void
+loop	/tmp/sketch7210316334309249705.cpp	/^void loop() {$/;"	kind:function	line:46	signature:()	returntype:void
+process	/tmp/sketch7210316334309249705.cpp	/^void process(YunClient client);$/;"	kind:prototype	line:61	signature:(YunClient client)	returntype:void
+process	/tmp/sketch7210316334309249705.cpp	/^void process(YunClient client) {$/;"	kind:function	line:62	signature:(YunClient client)	returntype:void
+digitalCommand	/tmp/sketch7210316334309249705.cpp	/^void digitalCommand(YunClient client) {$/;"	kind:function	line:82	signature:(YunClient client)	returntype:void
+analogCommand	/tmp/sketch7210316334309249705.cpp	/^void analogCommand(YunClient client) {$/;"	kind:function	line:110	signature:(YunClient client)	returntype:void
+modeCommand	/tmp/sketch7210316334309249705.cpp	/^void modeCommand(YunClient client) {$/;"	kind:function	line:151	signature:(YunClient client)	returntype:void
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListTemplates.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListTemplates.txt
@@ -0,0 +1,3 @@
+minimum	/tmp/sketch8398023134925534708.cpp	/^template <typename T> T minimum (T a, T b) $/;"	kind:function	line:2	signature:(T a, T b)	returntype:templateT
+setup	/tmp/sketch8398023134925534708.cpp	/^void setup () $/;"	kind:function	line:9	signature:()	returntype:void
+loop	/tmp/sketch8398023134925534708.cpp	/^void loop () { }$/;"	kind:function	line:13	signature:()	returntype:void
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListTemplates2.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserShouldListTemplates2.txt
@@ -0,0 +1,4 @@
+setup	/tmp/sketch463160524247569568.cpp	/^void setup() {$/;"	kind:function	line:1	signature:()	returntype:void
+loop	/tmp/sketch463160524247569568.cpp	/^void loop() {$/;"	kind:function	line:6	signature:()	returntype:void
+SRAM_writeAnything	/tmp/sketch463160524247569568.cpp	/^template <class T> int SRAM_writeAnything(int ee, const T& value)$/;"	kind:function	line:11	signature:(int ee, const T& value)	returntype:template int
+SRAM_readAnything	/tmp/sketch463160524247569568.cpp	/^template <class T> int SRAM_readAnything(int ee, T& value)$/;"	kind:function	line:21	signature:(int ee, T& value)	returntype:template int
diff --git a/src/arduino.cc/builder/test/ctags_output/TestCTagsParserStructWithFunctions.txt b/src/arduino.cc/builder/test/ctags_output/TestCTagsParserStructWithFunctions.txt
@@ -0,0 +1,8 @@
+sensorData	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^struct sensorData {$/;"	kind:struct	line:2
+sensorData	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^  sensorData(int iStatus, float iTemp, float iMinTemp) : status(iStatus), temp(iTemp), minTemp(iMinTemp) {}$/;"	kind:function	line:3	struct:sensorData	signature:(int iStatus, float iTemp, float iMinTemp)
+sensorData	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^  sensorData() : status(-1), temp(1023.0), minTemp(1023.0) {}$/;"	kind:function	line:4	struct:sensorData	signature:()
+sensors	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^sensorData sensors[2];$/;"	kind:variable	line:10
+sensor1	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^sensorData sensor1; \/\/(-1,1023.0,1023.0);$/;"	kind:variable	line:12
+sensor2	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^sensorData sensor2; \/\/(-1,1023.0,1023.0);$/;"	kind:variable	line:13
+setup	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^void setup() {$/;"	kind:function	line:16	signature:()	returntype:void
+loop	/tmp/build7315640391316178285.tmp/preproc/ctags_target.cpp	/^void loop() {$/;"	kind:function	line:22	signature:()	returntype:void
diff --git a/src/arduino.cc/builder/test/ctags_parser_test.go b/src/arduino.cc/builder/test/ctags_parser_test.go
@@ -33,20 +33,18 @@ import (
 	"arduino.cc/builder"
 	"arduino.cc/builder/constants"
 	"github.com/stretchr/testify/require"
+	"io/ioutil"
+	"path/filepath"
 	"testing"
 )
 
 func TestCTagsParserShouldListPrototypes(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "server\t/tmp/sketch7210316334309249705.cpp\t/^YunServer server;$/;\"\tkind:variable\tline:31\n" +
-		"setup\t/tmp/sketch7210316334309249705.cpp\t/^void setup() {$/;\"\tkind:function\tline:33\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/sketch7210316334309249705.cpp\t/^void loop() {$/;\"\tkind:function\tline:46\tsignature:()\treturntype:void\n" +
-		"process\t/tmp/sketch7210316334309249705.cpp\t/^void process(YunClient client);$/;\"\tkind:prototype\tline:61\tsignature:(YunClient client)\treturntype:void\n" +
-		"process\t/tmp/sketch7210316334309249705.cpp\t/^void process(YunClient client) {$/;\"\tkind:function\tline:62\tsignature:(YunClient client)\treturntype:void\n" +
-		"digitalCommand\t/tmp/sketch7210316334309249705.cpp\t/^void digitalCommand(YunClient client) {$/;\"\tkind:function\tline:82\tsignature:(YunClient client)\treturntype:void\n" +
-		"analogCommand\t/tmp/sketch7210316334309249705.cpp\t/^void analogCommand(YunClient client) {$/;\"\tkind:function\tline:110\tsignature:(YunClient client)\treturntype:void\n" +
-		"modeCommand\t/tmp/sketch7210316334309249705.cpp\t/^void modeCommand(YunClient client) {$/;\"\tkind:function\tline:151\tsignature:(YunClient client)\treturntype:void\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldListPrototypes.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -64,9 +62,10 @@ func TestCTagsParserShouldListPrototypes(t *testing.T) {
 func TestCTagsParserShouldListTemplates(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "minimum\t/tmp/sketch8398023134925534708.cpp\t/^template <typename T> T minimum (T a, T b) $/;\"\tkind:function\tline:2\tsignature:(T a, T b)\treturntype:templateT\n" +
-		"setup\t/tmp/sketch8398023134925534708.cpp\t/^void setup () $/;\"\tkind:function\tline:9\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/sketch8398023134925534708.cpp\t/^void loop () { }$/;\"\tkind:function\tline:13\tsignature:()\treturntype:void\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldListTemplates.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -82,10 +81,10 @@ func TestCTagsParserShouldListTemplates(t *testing.T) {
 func TestCTagsParserShouldListTemplates2(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "setup\t/tmp/sketch463160524247569568.cpp\t/^void setup() {$/;\"\tkind:function\tline:1\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/sketch463160524247569568.cpp\t/^void loop() {$/;\"\tkind:function\tline:6\tsignature:()\treturntype:void\n" +
-		"SRAM_writeAnything\t/tmp/sketch463160524247569568.cpp\t/^template <class T> int SRAM_writeAnything(int ee, const T& value)$/;\"\tkind:function\tline:11\tsignature:(int ee, const T& value)\treturntype:template int\n" +
-		"SRAM_readAnything\t/tmp/sketch463160524247569568.cpp\t/^template <class T> int SRAM_readAnything(int ee, T& value)$/;\"\tkind:function\tline:21\tsignature:(int ee, T& value)\treturntype:template int\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldListTemplates2.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -102,8 +101,10 @@ func TestCTagsParserShouldListTemplates2(t *testing.T) {
 func TestCTagsParserShouldDealWithClasses(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "SleepCycle\t/tmp/sketch9043227824785312266.cpp\t/^        SleepCycle( const char* name );$/;\"\tkind:prototype\tline:4\tsignature:( const char* name )\n" +
-		"SleepCycle\t/tmp/sketch9043227824785312266.cpp\t/^    SleepCycle::SleepCycle( const char* name )$/;\"\tkind:function\tline:8\tsignature:( const char* name )\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldDealWithClasses.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -116,11 +117,10 @@ func TestCTagsParserShouldDealWithClasses(t *testing.T) {
 func TestCTagsParserShouldDealWithStructs(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "A_NEW_TYPE\t/tmp/sketch8930345717354294915.cpp\t/^struct A_NEW_TYPE {$/;\"\tkind:struct\tline:3\n" +
-		"foo\t/tmp/sketch8930345717354294915.cpp\t/^} foo;$/;\"\tkind:variable\tline:7\ttyperef:struct:A_NEW_TYPE\n" +
-		"setup\t/tmp/sketch8930345717354294915.cpp\t/^void setup() {$/;\"\tkind:function\tline:9\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/sketch8930345717354294915.cpp\t/^void loop() {$/;\"\tkind:function\tline:13\tsignature:()\treturntype:void\n" +
-		"dostuff\t/tmp/sketch8930345717354294915.cpp\t/^void dostuff (A_NEW_TYPE * bar)$/;\"\tkind:function\tline:17\tsignature:(A_NEW_TYPE * bar)\treturntype:void\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldDealWithStructs.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -136,14 +136,10 @@ func TestCTagsParserShouldDealWithStructs(t *testing.T) {
 func TestCTagsParserShouldDealWithMacros(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "DEBUG\t/tmp/sketch5976699731718729500.cpp\t1;\"\tkind:macro\tline:1\n" +
-		"DISABLED\t/tmp/sketch5976699731718729500.cpp\t2;\"\tkind:macro\tline:2\n" +
-		"hello\t/tmp/sketch5976699731718729500.cpp\t/^String hello = \"world!\";$/;\"\tkind:variable\tline:16\n" +
-		"setup\t/tmp/sketch5976699731718729500.cpp\t/^void setup() {$/;\"\tkind:function\tline:18\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/sketch5976699731718729500.cpp\t/^void loop() {$/;\"\tkind:function\tline:23\tsignature:()\treturntype:void\n" +
-		"debug\t/tmp/sketch5976699731718729500.cpp\t/^void debug() {$/;\"\tkind:function\tline:35\tsignature:()\treturntype:void\n" +
-		"disabledIsDefined\t/tmp/sketch5976699731718729500.cpp\t/^void disabledIsDefined() {$/;\"\tkind:function\tline:46\tsignature:()\treturntype:void\n" +
-		"useMyType\t/tmp/sketch5976699731718729500.cpp\t/^int useMyType(MyType type) {$/;\"\tkind:function\tline:50\tsignature:(MyType type)\treturntype:int\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldDealWithMacros.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -161,9 +157,10 @@ func TestCTagsParserShouldDealWithMacros(t *testing.T) {
 func TestCTagsParserShouldDealFunctionWithDifferentSignatures(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^ void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;$/;\"	kind:prototype	line:4330	signature:(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const	returntype:void\n" +
-		"getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^boolean getBytes( byte addr, int amount ) // updates the byte array \"received\" with the given amount of bytes, read from the given address$/;\"	kind:function	line:5031	signature:( byte addr, int amount )	returntype:boolean\n" +
-		"getBytes	/tmp/test260613593/preproc/ctags_target.cpp	/^boolean getBytes( byte addr, int amount ) // updates the byte array \"received\" with the given amount of bytes, read from the given address$/;\"	kind:function	line:214	signature:( byte addr, int amount )	returntype:boolean"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserShouldDealFunctionWithDifferentSignatures.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)
@@ -177,11 +174,28 @@ func TestCTagsParserShouldDealFunctionWithDifferentSignatures(t *testing.T) {
 func TestCTagsParserClassMembersAreFilteredOut(t *testing.T) {
 	context := make(map[string]interface{})
 
-	context[constants.CTX_CTAGS_OUTPUT] = "set_values\t/tmp/test834438754/preproc/ctags_target.cpp\t/^    void set_values (int,int);$/;\"\tkind:prototype\tline:5\tclass:Rectangle\tsignature:(int,int)\treturntype:void\n" +
-		"area\t/tmp/test834438754/preproc/ctags_target.cpp\t/^    int area() {return width*height;}$/;\"\tkind:function\tline:6\tclass:Rectangle\tsignature:()\treturntype:int\n" +
-		"set_values\t/tmp/test834438754/preproc/ctags_target.cpp\t/^void Rectangle::set_values (int x, int y) {$/;\"\tkind:function\tline:9\tclass:Rectangle\tsignature:(int x, int y)\treturntype:void\n" +
-		"setup\t/tmp/test834438754/preproc/ctags_target.cpp\t/^void setup() {$/;\"\tkind:function\tline:14\tsignature:()\treturntype:void\n" +
-		"loop\t/tmp/test834438754/preproc/ctags_target.cpp\t/^void loop() {$/;\"\tkind:function\tline:18\tsignature:()\treturntype:void\n"
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserClassMembersAreFilteredOut.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
+
+	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
+	ctagsParser.Run(context)
+
+	prototypes := context[constants.CTX_PROTOTYPES].([]string)
+
+	require.Equal(t, 2, len(prototypes))
+	require.Equal(t, "void setup();", prototypes[0])
+	require.Equal(t, "void loop();", prototypes[1])
+}
+
+func TestCTagsParserStructWithFunctions(t *testing.T) {
+	context := make(map[string]interface{})
+
+	bytes, err := ioutil.ReadFile(filepath.Join("ctags_output", "TestCTagsParserStructWithFunctions.txt"))
+	NoError(t, err)
+
+	context[constants.CTX_CTAGS_OUTPUT] = string(bytes)
 
 	ctagsParser := builder.CTagsParser{PrototypesField: constants.CTX_PROTOTYPES}
 	ctagsParser.Run(context)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+getBytes /tmp/test260613593/preproc/ctags_target.cpp /^ void getBytes(unsigned char buf, unsigned int bufsize, unsigned int index=0) const;$/;" kind:prototype line:4330 signature:(unsigned char buf, unsigned int bufsize, unsigned int index=0) const returntype:void`
	`2`	`+getBytes /tmp/test260613593/preproc/ctags_target.cpp /^boolean getBytes( byte addr, int amount ) // updates the byte array "received" with the given amount of bytes, read from the given address$/;" kind:function line:5031 signature:( byte addr, int amount ) returntype:boolean`
	`3`	`+getBytes /tmp/test260613593/preproc/ctags_target.cpp /^boolean getBytes( byte addr, int amount ) // updates the byte array "received" with the given amount of bytes, read from the given address$/;" kind:function line:214 signature:( byte addr, int amount ) returntype:boolean`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+SleepCycle /tmp/sketch9043227824785312266.cpp /^ SleepCycle( const char* name );$/;" kind:prototype line:4 signature:( const char* name )`
	`2`	`+SleepCycle /tmp/sketch9043227824785312266.cpp /^ SleepCycle::SleepCycle( const char* name )$/;" kind:function line:8 signature:( const char* name )`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+minimum /tmp/sketch8398023134925534708.cpp /^template <typename T> T minimum (T a, T b) $/;" kind:function line:2 signature:(T a, T b) returntype:templateT`
	`2`	`+setup /tmp/sketch8398023134925534708.cpp /^void setup () $/;" kind:function line:9 signature:() returntype:void`
	`3`	`+loop /tmp/sketch8398023134925534708.cpp /^void loop () { }$/;" kind:function line:13 signature:() returntype:void`