Updating bundled ctags so that #27 is fixed. Added test to track it

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

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

@@ -106,12 +106,12 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 			OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/coan-5.2-i686-mingw32.zip"},
 			OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/coan-5.2-x86_64-apple-darwin.zip"},
 		}},
-		Tool{Name: "ctags", Version: "5.8-patched",
+		Tool{Name: "ctags", Version: "5.8-arduino1",
 			OsUrls: []OsUrl{
-				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">patched-i686-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">patched-x86_64-pc-linux-gnu.tar.bz2"},
-				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">patched-i686-mingw32.zip"},
-				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">patched-x86_64-apple-darwin.zip"},
+				OsUrl{Os: "i686-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">arduino1-i686-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "x86_64-pc-linux-gnu", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">arduino1-x86_64-pc-linux-gnu.tar.bz2"},
+				OsUrl{Os: "i686-mingw32", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">arduino1-i686-mingw32.zip"},
+				OsUrl{Os: "x86_64-apple-darwin", Url: "http://downloads.arduino.cc/tools/ctags-5.8-%3Cspan%20class="x x-first x-last">arduino1-x86_64-apple-darwin.zip"},
 			}},
 	}
 
@@ -536,6 +536,14 @@ func downloadAndUnpackTool(tool Tool, url string, targetPath string) error {
 	}
 	defer os.RemoveAll(unpackFolder)
 
+	_, err = os.Stat(filepath.Join(targetPath, tool.Name))
+	if err == nil {
+		err = os.RemoveAll(filepath.Join(targetPath, tool.Name))
+		if err != nil {
+			return utils.WrapError(err)
+		}
+	}
+
 	if len(files) == 1 && files[0].IsDir() {
 		err = os.MkdirAll(filepath.Join(targetPath, tool.Name), os.FileMode(0755))
 		if err != nil {

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

@@ -522,3 +522,43 @@ func TestPrototypesAdderSketchWithDefaultArgs(t *testing.T) {
 	require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
 	require.Equal(t, "void setup();\nvoid loop();\n#line 1\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
 }
+
+func TestPrototypesAdderSketchWithInlineFunction(t *testing.T) {
+	DownloadCoresAndToolsAndLibraries(t)
+
+	context := make(map[string]interface{})
+
+	buildPath := SetupBuildPath(t, context)
+	defer os.RemoveAll(buildPath)
+
+	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware"}
+	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools"}
+	context[constants.CTX_FQBN] = "arduino:avr:leonardo"
+	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch_with_inline_function", "sketch.ino")
+	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
+	context[constants.CTX_LIBRARIES_FOLDERS] = []string{"libraries", "downloaded_libraries"}
+	context[constants.CTX_VERBOSE] = true
+
+	commands := []types.Command{
+		&builder.SetupHumanLoggerIfMissing{},
+
+		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
+
+		&builder.ContainerMergeCopySketchFiles{},
+
+		&builder.ContainerFindIncludes{},
+
+		&builder.PrintUsedLibrariesIfVerbose{},
+		&builder.WarnAboutArchIncompatibleLibraries{},
+
+		&builder.ContainerAddPrototypes{},
+	}
+
+	for _, command := range commands {
+		err := command.Run(context)
+		NoError(t, err)
+	}
+
+	require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
+	require.Equal(t, "void setup();\nvoid loop();\nshort unsigned int testInt();\nint8_t testInline();\nuint8_t testAttribute();\n#line 1\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
+}

src/arduino.cc/builder/test/sketch_with_inline_function/sketch.ino

@@ -0,0 +1,14 @@
+void setup() {}
+void loop() {}
+
+short unsigned int testInt(){
+
+}
+
+static inline int8_t testInline(){
+
+}
+
+__attribute__((always_inline)) uint8_t testAttribute() {
+
+}