Merge branch 'filename-quoting' of https://github.com/matthijskooijman/arduino-builder

cmaglie · cmaglie · commit edbf3865caf6 · 2016-05-26T17:30:30.000+02:00
Signed-off-by: Cristian Maglie &lt;c.maglie@arduino.cc&gt;
diff --git a/src/arduino.cc/builder/collect_ctags_from_sketch_files.go b/src/arduino.cc/builder/collect_ctags_from_sketch_files.go
@@ -32,7 +32,6 @@ package builder
 import (
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
-	"strings"
 )
 
 type CollectCTagsFromSketchFiles struct{}
@@ -43,7 +42,7 @@ func (s *CollectCTagsFromSketchFiles) Run(ctx *types.Context) error {
 	allCtags := ctx.CTagsOfPreprocessedSource
 	ctagsOfSketch := []*types.CTag{}
 	for _, ctag := range allCtags {
-		if utils.SliceContains(sketchFileNames, strings.Replace(ctag.Filename, "\\\\", "\\", -1)) {
+		if utils.SliceContains(sketchFileNames, ctag.Filename) {
 			ctagsOfSketch = append(ctagsOfSketch, ctag)
 		}
 	}
diff --git a/src/arduino.cc/builder/ctags/ctags_parser.go b/src/arduino.cc/builder/ctags/ctags_parser.go
@@ -229,7 +229,14 @@ func parseTag(row string) *types.CTag {
 	parts := strings.Split(row, "\t")
 
 	tag.FunctionName = parts[0]
-	tag.Filename = parts[1]
+	// This unescapes any backslashes in the filename. These
+	// filenames that ctags outputs originate from the line markers
+	// in the source, as generated by gcc. gcc escapes both
+	// backslashes and double quotes, but ctags ignores any escaping
+	// and just cuts off the filename at the first double quote it
+	// sees. This means any backslashes are still escaped, and need
+	// to be unescape, and any quotes will just break the build.
+	tag.Filename = strings.Replace(parts[1], "\\\\", "\\", -1)
 
 	parts = parts[2:]
 
diff --git a/src/arduino.cc/builder/prototypes_adder.go b/src/arduino.cc/builder/prototypes_adder.go
@@ -32,6 +32,7 @@ package builder
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
 	"fmt"
 	"strconv"
 	"strings"
@@ -87,7 +88,7 @@ func composePrototypeSection(line int, prototypes []*types.Prototype) string {
 	str := joinPrototypes(prototypes)
 	str += "\n#line "
 	str += strconv.Itoa(line)
-	str += " \"" + prototypes[0].File + "\""
+	str += " " + utils.QuoteCppString(prototypes[0].File)
 	str += "\n"
 
 	return str
@@ -99,7 +100,7 @@ func joinPrototypes(prototypes []*types.Prototype) string {
 		if signatureContainsaDefaultArg(proto) {
 			continue
 		}
-		prototypesSlice = append(prototypesSlice, "#line "+strconv.Itoa(proto.Line)+" \""+proto.File+"\"")
+		prototypesSlice = append(prototypesSlice, "#line "+strconv.Itoa(proto.Line)+" "+utils.QuoteCppString(proto.File))
 		prototypeParts := []string{}
 		if proto.Modifiers != "" {
 			prototypeParts = append(prototypeParts, proto.Modifiers)
diff --git a/src/arduino.cc/builder/sketch_source_merger.go b/src/arduino.cc/builder/sketch_source_merger.go
@@ -32,8 +32,8 @@ package builder
 
 import (
 	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
 	"regexp"
-	"strings"
 )
 
 type SketchSourceMerger struct{}
@@ -47,7 +47,7 @@ func (s *SketchSourceMerger) Run(ctx *types.Context) error {
 		includeSection += "#include <Arduino.h>\n"
 		lineOffset++
 	}
-	includeSection += "#line 1 \"" + strings.Replace((&sketch.MainFile).Name, "\\", "\\\\", -1) + "\"\n"
+	includeSection += "#line 1 " + utils.QuoteCppString(sketch.MainFile.Name) + "\n"
 	lineOffset++
 	ctx.IncludeSection = includeSection
 
@@ -73,7 +73,7 @@ func sketchIncludesArduinoH(sketch *types.SketchFile) bool {
 }
 
 func addSourceWrappedWithLineDirective(sketch *types.SketchFile) string {
-	source := "#line 1 \"" + strings.Replace(sketch.Name, "\\", "\\\\", -1) + "\"\n"
+	source := "#line 1 " + utils.QuoteCppString(sketch.Name) + "\n"
 	source += sketch.Source
 	source += "\n"
 
diff --git a/src/arduino.cc/builder/test/helper.go b/src/arduino.cc/builder/test/helper.go
@@ -33,22 +33,20 @@ package test
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
 	"bytes"
 	"fmt"
 	"github.com/go-errors/errors"
 	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"path/filepath"
-	"strings"
 	"testing"
 	"text/template"
 )
 
 func LoadAndInterpolate(t *testing.T, filename string, ctx *types.Context) string {
 	funcsMap := template.FuncMap{
-		"EscapeBackSlashes": func(s string) string {
-			return strings.Replace(s, "\\", "\\\\", -1)
-		},
+		"QuoteCppString": utils.QuoteCppString,
 	}
 
 	tpl, err := template.New(filepath.Base(filename)).Funcs(funcsMap).ParseFiles(filename)
diff --git a/src/arduino.cc/builder/test/prototypes_adder_test.go b/src/arduino.cc/builder/test/prototypes_adder_test.go
diff --git a/src/arduino.cc/builder/test/sketch1/merged_sketch.txt b/src/arduino.cc/builder/test/sketch1/merged_sketch.txt
@@ -1,16 +1,16 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
 
 }
 
 void loop() {
 
 }
-#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 0).Name}}"
+#line 1 {{QuoteCppString (index .sketch.OtherSketchFiles 0).Name}}
 
-#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 1).Name}}"
+#line 1 {{QuoteCppString (index .sketch.OtherSketchFiles 1).Name}}
 String hello() {
   return "world";
 }
diff --git a/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.preprocessed.txt b/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.preprocessed.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 #define DEBUG 1
 #define DISABLED 0
 
@@ -16,17 +16,17 @@ typedef int MyType;
 
 #include "empty_2.h"
 
-#line 16 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 16 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 21 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 21 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 33 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 33 {{QuoteCppString .sketch.MainFile.Name}}
 void debug();
-#line 44 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 44 {{QuoteCppString .sketch.MainFile.Name}}
 void disabledIsDefined();
-#line 48 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 48 {{QuoteCppString .sketch.MainFile.Name}}
 int useMyType(MyType type);
-#line 16 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 16 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
   // put your setup code here, to run once:
 
diff --git a/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.resolved.directives.txt b/src/arduino.cc/builder/test/sketch2/SketchWithIfDef.resolved.directives.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 #define DEBUG 1
 #define DISABLED 0
 
diff --git a/src/arduino.cc/builder/test/sketch3/Baladuino.preprocessed.txt b/src/arduino.cc/builder/test/sketch3/Baladuino.preprocessed.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 /*
  * The code is released under the GNU General Public License.
  * Developed by Kristian Lauszus, TKJ Electronics 2013
@@ -88,11 +88,11 @@ WII Wii(&Btd); // The Wii library can communicate with Wiimotes and the Nunchuck
 // This can also be done using the Android or Processing application
 #endif
 
-#line 88 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 88 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 204 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 204 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 88 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 88 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
   /* Initialize UART */
   Serial.begin(115200);
diff --git a/src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt b/src/arduino.cc/builder/test/sketch4/CharWithEscapedDoubleQuote.preprocessed.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 #include <SoftwareSerial.h> // required to send and receive AT commands from the GPRS Shield
 #include <Wire.h> // required for I2C communication with the RTC
 
@@ -39,49 +39,49 @@ Code Exclusively for GPRS shield:
 //  Default set of instructions for GPRS Shield power control
 //
 
-#line 39 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 39 {{QuoteCppString .sketch.MainFile.Name}}
 void setPowerStateTo( int newState );
-#line 64 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 64 {{QuoteCppString .sketch.MainFile.Name}}
 int getPowerState();
-#line 75 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 75 {{QuoteCppString .sketch.MainFile.Name}}
 void powerUpOrDown();
-#line 90 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 90 {{QuoteCppString .sketch.MainFile.Name}}
 void clearBufferArray();
-#line 96 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 96 {{QuoteCppString .sketch.MainFile.Name}}
 void makeMissedCall( char num[] );
-#line 111 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 111 {{QuoteCppString .sketch.MainFile.Name}}
 void sendTextMessage( char number[], char messg[] );
-#line 129 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 129 {{QuoteCppString .sketch.MainFile.Name}}
 void analise(byte incoming[], int length);
-#line 179 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 179 {{QuoteCppString .sketch.MainFile.Name}}
 byte decToBcd( byte b );
-#line 184 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 184 {{QuoteCppString .sketch.MainFile.Name}}
 boolean getBit( byte addr, int pos );
-#line 190 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 190 {{QuoteCppString .sketch.MainFile.Name}}
 void setBit( byte addr, int pos, boolean newBit );
-#line 204 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 204 {{QuoteCppString .sketch.MainFile.Name}}
 byte getByte( byte addr );
-#line 213 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 213 {{QuoteCppString .sketch.MainFile.Name}}
 boolean getBytes( byte addr, int amount );
-#line 230 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 230 {{QuoteCppString .sketch.MainFile.Name}}
 void setByte( byte addr, byte newByte );
-#line 235 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 235 {{QuoteCppString .sketch.MainFile.Name}}
 void setBytes( byte addr, byte newBytes[], int amount );
-#line 244 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 244 {{QuoteCppString .sketch.MainFile.Name}}
 void getTime();
-#line 260 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 260 {{QuoteCppString .sketch.MainFile.Name}}
 void setTime( byte newTime[ 7 ] );
-#line 267 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 267 {{QuoteCppString .sketch.MainFile.Name}}
 void getRTCTemperature();
-#line 277 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 277 {{QuoteCppString .sketch.MainFile.Name}}
 void gprsListen();
-#line 294 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 294 {{QuoteCppString .sketch.MainFile.Name}}
 void printTime();
-#line 317 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 317 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 334 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 334 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 39 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 39 {{QuoteCppString .sketch.MainFile.Name}}
 void setPowerStateTo( int newState )
 {
   if( newState != 1 && newState != 0 ) { // tests for an invalid state. In this case no change is made to powerstate
diff --git a/src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt b/src/arduino.cc/builder/test/sketch5/IncludeBetweenMultilineComment.preprocessed.txt
@@ -1,16 +1,16 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 #include <CapacitiveSensor.h>
 /*
 #include <WiFi.h>
 */
 CapacitiveSensor cs_13_8 = CapacitiveSensor(13,8);
-#line 6 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 6 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 10 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 10 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 6 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 6 {{QuoteCppString .sketch.MainFile.Name}}
 void setup()
 {
 	Serial.begin(9600);
diff --git a/src/arduino.cc/builder/test/sketch6/LineContinuations.preprocessed.txt b/src/arduino.cc/builder/test/sketch6/LineContinuations.preprocessed.txt
@@ -1,17 +1,17 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 const char *foo = "\
 hello \
 world\n";
 
 //" delete this comment line and the IDE parser will crash
 
-#line 7 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 7 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 11 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 11 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 7 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 7 {{QuoteCppString .sketch.MainFile.Name}}
 void setup()
 {
 }
diff --git a/src/arduino.cc/builder/test/sketch7/StringWithComment.preprocessed.txt b/src/arduino.cc/builder/test/sketch7/StringWithComment.preprocessed.txt
@@ -1,11 +1,11 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 10 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 10 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
   // put your setup code here, to run once:
   // "comment with a double quote
diff --git a/src/arduino.cc/builder/test/sketch8/SketchWithStruct.preprocessed.txt b/src/arduino.cc/builder/test/sketch8/SketchWithStruct.preprocessed.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 /* START CODE */
 
 struct A_NEW_TYPE {
@@ -9,13 +9,13 @@ struct A_NEW_TYPE {
   int c;
 } foo;
 
-#line 9 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 9 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 13 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 13 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 17 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 17 {{QuoteCppString .sketch.MainFile.Name}}
 void dostuff (A_NEW_TYPE * bar);
-#line 9 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 9 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
 
 }
diff --git a/src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.preprocessed.txt b/src/arduino.cc/builder/test/sketch_with_config/sketch_with_config.preprocessed.txt
@@ -1,6 +1,6 @@
 #include <Arduino.h>
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
+#line 1 {{QuoteCppString .sketch.MainFile.Name}}
 #include "config.h"
 
 #ifdef DEBUG
@@ -13,11 +13,11 @@
 
 #include <Bridge.h>
 
-#line 13 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 13 {{QuoteCppString .sketch.MainFile.Name}}
 void setup();
-#line 17 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 17 {{QuoteCppString .sketch.MainFile.Name}}
 void loop();
-#line 13 "{{EscapeBackSlashes .sketch.MainFile.Name}}"
+#line 13 {{QuoteCppString .sketch.MainFile.Name}}
 void setup() {
 
 }
diff --git a/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.SAM.txt b/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.SAM.txt
diff --git a/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.txt b/src/arduino.cc/builder/test/sketch_with_ifdef/sketch.preprocessed.txt
diff --git a/src/arduino.cc/builder/test/utils_test.go b/src/arduino.cc/builder/test/utils_test.go
diff --git a/src/arduino.cc/builder/utils/utils.go b/src/arduino.cc/builder/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ package builder`
`32`	`32`	`import (`
`33`	`33`	`"arduino.cc/builder/types"`
`34`	`34`	`"arduino.cc/builder/utils"`
`35`		`- "strings"`
`36`	`35`	`)`
`37`	`36`
`38`	`37`	`type CollectCTagsFromSketchFiles struct{}`
`@@ -43,7 +42,7 @@ func (s CollectCTagsFromSketchFiles) Run(ctx types.Context) error {`
`43`	`42`	`allCtags := ctx.CTagsOfPreprocessedSource`
`44`	`43`	`ctagsOfSketch := []*types.CTag{}`
`45`	`44`	`for _, ctag := range allCtags {`
`46`		`- if utils.SliceContains(sketchFileNames, strings.Replace(ctag.Filename, "\\\\", "\\", -1)) {`
	`45`	`+ if utils.SliceContains(sketchFileNames, ctag.Filename) {`
`47`	`46`	`ctagsOfSketch = append(ctagsOfSketch, ctag)`
`48`	`47`	`}`
`49`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`#include <Arduino.h>`
`2`		`-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"`
`3`		`-#line 1 "{{EscapeBackSlashes .sketch.MainFile.Name}}"`
	`2`	`+#line 1 {{QuoteCppString .sketch.MainFile.Name}}`
	`3`	`+#line 1 {{QuoteCppString .sketch.MainFile.Name}}`
`4`	`4`	`void setup() {`
`5`	`5`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`void loop() {`
`9`	`9`
`10`	`10`	`}`
`11`		`-#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 0).Name}}"`
	`11`	`+#line 1 {{QuoteCppString (index .sketch.OtherSketchFiles 0).Name}}`
`12`	`12`
`13`		`-#line 1 "{{EscapeBackSlashes (index .sketch.OtherSketchFiles 1).Name}}"`
	`13`	`+#line 1 {{QuoteCppString (index .sketch.OtherSketchFiles 1).Name}}`
`14`	`14`	`String hello() {`
`15`	`15`	`return "world";`
`16`	`16`	`}`