Simplify CTag structure

Signed-off-by: Cristian Maglie <c.maglie@arduino.cc>

Author: cmaglie

src/arduino.cc/builder/ctags_parser.go

@@ -87,7 +87,7 @@ func addPrototypes(tags []*types.CTag) {
 }
 
 func addPrototype(tag *types.CTag) {
-	if strings.Index(tag.Returntype, TEMPLATE) == 0 || strings.Index(tag.Code, TEMPLATE) == 0 {
+	if strings.Index(tag.Prototype, TEMPLATE) == 0 || strings.Index(tag.Code, TEMPLATE) == 0 {
 		code := tag.Code
 		if strings.Contains(code, "{") {
 			code = code[:strings.Index(code, "{")]
@@ -98,8 +98,6 @@ func addPrototype(tag *types.CTag) {
 		return
 	}
 
-	tag.Prototype = tag.Returntype + " " + tag.FunctionName + tag.Signature + ";"
-
 	tag.PrototypeModifiers = ""
 	if strings.Index(tag.Code, STATIC+" ") != -1 {
 		tag.PrototypeModifiers = tag.PrototypeModifiers + " " + STATIC
@@ -152,7 +150,7 @@ func skipTagsWhere(tags []*types.CTag, skipFunc skipFuncType, context map[string
 }
 
 func signatureContainsDefaultArg(tag *types.CTag) bool {
-	return strings.Contains(tag.Signature, "=")
+	return strings.Contains(tag.Prototype, "=")
 }
 
 func prototypeAndCodeDontMatch(tag *types.CTag) bool {
@@ -207,6 +205,8 @@ func parseTag(row string) *types.CTag {
 
 	parts = parts[2:]
 
+	signature := ""
+	returntype := ""
 	for _, part := range parts {
 		if strings.Contains(part, ":") {
 			colon := strings.Index(part, ":")
@@ -222,9 +222,9 @@ func parseTag(row string) *types.CTag {
 			case "typeref":
 				tag.Typeref = value
 			case "signature":
-				tag.Signature = value
+				signature = value
 			case "returntype":
-				tag.Returntype = value
+				returntype = value
 			case "class":
 				tag.Class = value
 			case "struct":
@@ -234,6 +234,7 @@ func parseTag(row string) *types.CTag {
 			}
 		}
 	}
+	tag.Prototype = returntype + " " + tag.FunctionName + signature + ";"
 
 	if strings.Contains(row, "/^") && strings.Contains(row, "$/;") {
 		tag.Code = row[strings.Index(row, "/^")+2 : strings.Index(row, "$/;")]

src/arduino.cc/builder/test/ctags_parser_test.go

@@ -104,13 +104,15 @@ func TestCTagsParserShouldListTemplates(t *testing.T) {
 	idx := 0
 	require.Equal(t, "minimum", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "(T a, T b)", ctags[idx].Signature)
+	require.Equal(t, "template <typename T> T minimum (T a, T b);", ctags[idx].Prototype)
 	idx++
 	require.Equal(t, "setup", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
+	require.Equal(t, "void setup();", ctags[idx].Prototype)
 	idx++
 	require.Equal(t, "loop", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
+	require.Equal(t, "void loop();", ctags[idx].Prototype)
 }
 
 func TestCTagsParserShouldListTemplates2(t *testing.T) {
@@ -136,11 +138,11 @@ func TestCTagsParserShouldListTemplates2(t *testing.T) {
 	idx++
 	require.Equal(t, "SRAM_writeAnything", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "(int ee, const T& value)", ctags[idx].Signature)
+	require.Equal(t, "template <class T> int SRAM_writeAnything(int ee, const T& value);", ctags[idx].Prototype)
 	idx++
 	require.Equal(t, "SRAM_readAnything", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "(int ee, T& value)", ctags[idx].Signature)
+	require.Equal(t, "template <class T> int SRAM_readAnything(int ee, T& value);", ctags[idx].Prototype)
 }
 
 func TestCTagsParserShouldDealWithClasses(t *testing.T) {
@@ -355,7 +357,7 @@ func TestCTagsParserDefaultArguments(t *testing.T) {
 	idx := 0
 	require.Equal(t, "test", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "(int x = 1)", ctags[idx].Signature)
+	require.Equal(t, "void test(int x = 1);", ctags[idx].Prototype)
 	idx++
 	require.Equal(t, "setup", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
@@ -469,10 +471,9 @@ func TestCTagsParserFunctionPointers(t *testing.T) {
 	idx++
 	require.Equal(t, "funcArr", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "()", ctags[idx].Signature)
+	require.Equal(t, "int funcArr();", ctags[idx].Prototype)
 	idx++
 	require.Equal(t, "funcCombo", ctags[idx].FunctionName)
 	require.Equal(t, "function", ctags[idx].Kind)
-	require.Equal(t, "(void (*(&in)[5])(int))", ctags[idx].Signature)
-
-}
+	require.Equal(t, "void funcCombo(void (*(&in)[5])(int));", ctags[idx].Prototype)
+}

src/arduino.cc/builder/types/types.go

@@ -180,8 +180,6 @@ type CTag struct {
 	FunctionName string
 	Kind         string
 	Line         int
-	Signature    string
-	Returntype   string
 	Code         string
 	Class        string
 	Struct       string