Merge pull request #3 from strict-lang/feature/diagnostics

Add diagnostics and cross-compile fix

Author: ehenoma

.travis.yml

@@ -30,7 +30,7 @@ _bundle: &_bundle
   stage: bundle
   script:
     - EXECUTABLE_PATH=./output/$TRAVIS_BRANCH/$STRICT_PLATFORM/$STRICT_ARCHITECTURE/strict
-    - go build -o $EXECUTABLE_PATH ./cmd/strict
+    - GOOS=$COMPILE_OS GOARCH=$COMPILE_ARCH go build -o $EXECUTABLE_PATH ./cmd/strict
     - RESULT_DIRECTORY=output/$TRAVIS_BRANCH/artifacts
     - strict_sdk make -p $STRICT_PLATFORM -a $STRICT_ARCHITECTURE -b -o $RESULT_DIRECTORY -v $TRAVIS_BRANCH -e $EXECUTABLE_PATH
   deploy:
@@ -47,13 +47,13 @@ jobs:
     # Bundles a Strict SDK by using the executable built in the 'build' stage and deploys it to
     # the Github releases. The $GITHUB_OAUTH_TOKEN has to be defined.
     - name: bundle-osx
-      env: [STRICT_PLATFORM=osx STRICT_ARCHITECTURE=x86_64 GOOS=darwin GOARCH=amd]
+      env: [STRICT_PLATFORM=osx STRICT_ARCHITECTURE=x86_64 COMPILE_OS=darwin COMPILE_ARCH=amd64]
       <<: *_bundle
     - name: bundle-linux
-      env: [STRICT_PLATFORM=windows STRICT_ARCHITECTURE=x86_64 GOOS=windows GOARCH=amd]
+      env: [STRICT_PLATFORM=windows STRICT_ARCHITECTURE=x86_64 COMPILE_OS=windows COMPILE_ARCH=amd64]
       <<: *_bundle
     - name: bundle-windows
-      env: [STRICT_PLATFORM=linux STRICT_ARCHITECTURE=x86_64 GOOS=linux GOARCH=amd]
+      env: [STRICT_PLATFORM=linux STRICT_ARCHITECTURE=x86_64 COMPILE_OS=linux COMPILE_ARCH=amd64]
       <<: *_bundle
     # Runs all tests.
     - stage: test

cmd/strict/command_build.go

@@ -5,6 +5,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/strict-lang/sdk/pkg/compiler"
 	"github.com/strict-lang/sdk/pkg/compiler/backend"
+	"github.com/strict-lang/sdk/pkg/compiler/input/linemap"
 	"github.com/strict-lang/sdk/pkg/compiler/report"
 	"io/ioutil"
 	"log"
@@ -40,18 +41,18 @@ func disableLogging() {
 	}
 }
 
-var reportFormats = map[string] func(report.Report) report.Output {
+var reportFormats = map[string] func(report.Report, *linemap.LineMap) report.Output {
 	"text": report.NewRenderingOutput,
-	"json": func(input report.Report) report.Output {
+	"json": func(input report.Report, lineMap *linemap.LineMap) report.Output {
 		return report.NewSerializingOutput(report.NewJsonSerializationFormat(), input)
 	},
-	"pretty-json": func(input report.Report) report.Output {
+	"pretty-json": func(input report.Report, lineMap *linemap.LineMap) report.Output {
 		return report.NewSerializingOutput(report.NewPrettyJsonSerializationFormat(), input)
 	},
-	"xml": func(input report.Report) report.Output {
+	"xml": func(input report.Report, lineMap *linemap.LineMap) report.Output {
 		return report.NewSerializingOutput(report.NewXmlSerializationFormat(), input)
 	},
-	"pretty-xml": func(input report.Report) report.Output {
+	"pretty-xml": func(input report.Report, lineMap *linemap.LineMap) report.Output {
 		return report.NewSerializingOutput(report.NewPrettyXmlSerializationFormat(), input)
 	},
 }
@@ -69,47 +70,56 @@ func createFailedReport(beginTime time.Time) report.Report {
 
 func RunCompile(command *cobra.Command, arguments []string) error {
 	disableLogging()
-	compilationReport := compile(command, arguments)
-	output := createOutput(compilationReport)
+	compilationReport, lineMap := compile(command, arguments)
+	output := createOutput(compilationReport, lineMap)
 	return output.Print(command.OutOrStdout())
 }
 
-func createOutput(compilationReport report.Report) report.Output {
+func createOutput(
+	compilationReport report.Report,
+	lineMap *linemap.LineMap) report.Output {
+
 	if output, ok := reportFormats[buildOptions.reportFormat]; ok {
-		return output(compilationReport)
+		return output(compilationReport, lineMap)
 	}
-	return report.NewRenderingOutput(compilationReport)
+	return report.NewRenderingOutput(compilationReport, lineMap)
 }
 
-func compile(command *cobra.Command, arguments []string) report.Report {
+func compile(
+	command *cobra.Command, arguments []string) (report.Report, *linemap.LineMap) {
+
 	beginTime := time.Now()
 	file, ok := findSourceFileInArguments(command, arguments)
 	if !ok {
-		return createFailedReport(beginTime)
+		return createFailedReport(beginTime), linemap.Empty()
 	}
 	defer file.Close()
 	name, err := ParseUnitName(file.Name())
 	if err != nil {
 		command.Printf("Invalid filename: %s\n", file.Name())
-		return createFailedReport(beginTime)
+		return createFailedReport(beginTime), linemap.Empty()
 	}
 	return runCompilation(command, name, file)
 }
 
-func runCompilation(command *cobra.Command, unitName string, file *os.File) report.Report {
+func runCompilation(
+	command *cobra.Command,
+	unitName string,
+	file *os.File) (report.Report, *linemap.LineMap) {
+
 	compilation := &compiler.Compilation{
 		Name:    unitName,
 		Source:  &compiler.FileSource{File: file},
 	}
 	result := compilation.Compile()
 	if result.Error != nil {
-		return result.Report
+		return result.Report, result.LineMap
 	}
 	if err := writeGeneratedSources(result); err != nil {
 		command.PrintErrf("failed to write generated sources %v\n", err)
 		result.Report.Success = false
 	}
-	return result.Report
+	return result.Report, result.LineMap
 }
 
 func writeGeneratedSources(compilation compiler.Result) (err error) {

cmd/strict/command_tree.go

@@ -33,7 +33,6 @@ func createUnitNameFromFileName(name string) string {
 
 func parseAndPrintAst(command *cobra.Command, sourceFile *os.File) {
 	parseResult := compiler.ParseFile(sourceFile.Name(), sourceFile)
-	parseResult.Diagnostics.PrintEntries(&cobraDiagnosticPrinter{command})
 	if parseResult.Error != nil {
 		return
 	}

pkg/compiler/analysis/import_pass.go

@@ -6,8 +6,8 @@ import (
 	"github.com/strict-lang/sdk/pkg/compiler/isolate"
 	passes "github.com/strict-lang/sdk/pkg/compiler/pass"
 	"github.com/strict-lang/sdk/pkg/compiler/scope"
+	"io/ioutil"
 	"os"
-	"path/filepath"
 	"strings"
 )
 
@@ -54,11 +54,15 @@ func (pass *ImportPass) importWorkingDirectory(scope scope.MutableScope) {
 	pass.importFiles(files, scope)
 }
 
-func (pass *ImportPass) shouldImportFile(name string) bool {
-	return !strings.HasSuffix(name, pass.currentFile+strictFileExtension)
+func (pass *ImportPass) shouldImportFile(info os.FileInfo) bool {
+	name := info.Name()
+	return strings.HasSuffix(name, pass.currentFile + strictFileExtension)
 }
 
-func filterFiles(files []string, filter func(string) bool) (filtered []string) {
+func filterFiles(
+	files []os.FileInfo,
+	filter func(info os.FileInfo) bool) (filtered []os.FileInfo) {
+
 	for _, file := range files {
 		if filter(file) {
 			filtered = append(filtered, file)
@@ -76,25 +80,28 @@ func (pass *ImportPass) importDirectory(directory string, scope scope.MutableSco
 	pass.importFiles(files, scope)
 }
 
-func (pass *ImportPass) importFiles(files []string, scope scope.MutableScope) {
-	importing := NewSourceImporting(files)
+func (pass *ImportPass) importFiles(files []os.FileInfo, scope scope.MutableScope) {
+	names := convertInfosToNames(files)
+	importing := NewSourceImporting(names)
 	if err := importing.Import(scope); err != nil {
 		pass.reportFailedImport(err)
 	}
 }
 
-func listFilesInDirectory(directory string) (files []string, err error) {
-	err = filepath.Walk(directory, func(path string, info os.FileInfo, walkErr error) error {
-		if walkErr == nil && isStrictFile(info) {
-			files = append(files, path)
-		}
-		return walkErr
-	})
-	return files, err
+func convertInfosToNames(infos []os.FileInfo) (names []string) {
+	for _, info := range infos {
+		names = append(names, info.Name())
+	}
+	return
+}
+
+func listFilesInDirectory(directory string) (files []os.FileInfo, err error) {
+	return ioutil.ReadDir(directory)
 }
 
 func listFilesInDirectoryFiltered(
-	directory string, filter func(string) bool) ([]string, error) {
+	directory string,
+	filter func(info os.FileInfo) bool) ([]os.FileInfo, error) {
 
 	files, err := listFilesInDirectory(directory)
 	if err != nil {

pkg/compiler/analysis/source_importing.go

@@ -2,7 +2,6 @@ package analysis
 
 import (
 	"fmt"
-	"github.com/strict-lang/sdk/pkg/compiler/diagnostic"
 	"github.com/strict-lang/sdk/pkg/compiler/grammar/syntax"
 	"github.com/strict-lang/sdk/pkg/compiler/grammar/tree"
 	"github.com/strict-lang/sdk/pkg/compiler/input"
@@ -70,7 +69,6 @@ func (importing *SourceImporting) parseFile(name string) *tree.TranslationUnit {
 	defer file.Close()
 	result := syntax.Parse(name, input.NewStreamReader(file))
 	if result.Error != nil {
-		result.Diagnostics.PrintEntries(diagnostic.NewFmtPrinter())
 		importing.reportFailedParse(name, result.Error)
 		return nil
 	}

pkg/compiler/analysis/type_resolution.go

@@ -167,7 +167,7 @@ func (pass *TypeResolution) resolveCalledMethod(
 }
 
 func (pass *TypeResolution) reportFailedInference(node tree.Node) {
-	panic("Failed to infer node")
+	// panic("Failed to infer node")
 }
 
 func isResolved(expression tree.Expression) bool {

pkg/compiler/compilation.go

@@ -3,14 +3,20 @@ package compiler
 import (
 	"fmt"
 	"github.com/strict-lang/sdk/pkg/compiler/backend"
+	_ "github.com/strict-lang/sdk/pkg/compiler/backend/arduino"
+	_ "github.com/strict-lang/sdk/pkg/compiler/backend/cpp"
+	_ "github.com/strict-lang/sdk/pkg/compiler/backend/ilasm"
+	_ "github.com/strict-lang/sdk/pkg/compiler/backend/silk"
 	"github.com/strict-lang/sdk/pkg/compiler/diagnostic"
 	"github.com/strict-lang/sdk/pkg/compiler/grammar/syntax"
 	"github.com/strict-lang/sdk/pkg/compiler/grammar/tree"
 	"github.com/strict-lang/sdk/pkg/compiler/input"
+	"github.com/strict-lang/sdk/pkg/compiler/input/linemap"
 	isolates "github.com/strict-lang/sdk/pkg/compiler/isolate"
 	"github.com/strict-lang/sdk/pkg/compiler/lowering"
 	"github.com/strict-lang/sdk/pkg/compiler/pass"
 	"github.com/strict-lang/sdk/pkg/compiler/report"
+	"log"
 	"time"
 )
 
@@ -29,6 +35,7 @@ type Result struct {
 	GeneratedFiles []backend.GeneratedFile
 	Report         report.Report
 	Error          error
+	LineMap *linemap.LineMap
 }
 
 type Generated struct {
@@ -104,7 +111,6 @@ func translateDiagnosticKind(kind *diagnostic.Kind) report.DiagnosticKind {
 	}
 }
 
-
 func (compilation *Compilation) Compile() Result {
 	compilation.beginTime = time.Now()
 	parseResult := compilation.parse()
@@ -115,14 +121,18 @@ func (compilation *Compilation) Compile() Result {
 			Report:         compilation.createReport(failure),
 			Error:          parseResult.Error,
 			UnitName:       compilation.Name,
+			LineMap:        parseResult.LineMap,
 		}
 	}
 	compilation.Lower(parseResult.TranslationUnit)
+	generatedFiles, err := compilation.generateOutput(parseResult.TranslationUnit)
+
 	return Result{
-		GeneratedFiles: compilation.generateOutput(parseResult.TranslationUnit),
+		GeneratedFiles: generatedFiles,
 		Report:         compilation.createReport(success),
-		Error:          nil,
+		Error:          err,
 		UnitName:       parseResult.TranslationUnit.Name,
+		LineMap: parseResult.LineMap,
 	}
 }
 
@@ -140,13 +150,16 @@ func (compilation *Compilation) parse() syntax.Result {
 }
 
 func (compilation *Compilation) generateOutput(
-	unit *tree.TranslationUnit) []backend.GeneratedFile {
+	unit *tree.TranslationUnit) ([]backend.GeneratedFile, error) {
 
-	output, _ := compilation.invokeBackend(backend.Input{
+	output, err := compilation.invokeBackend(backend.Input{
 		Unit:        unit,
 		Diagnostics: diagnostic.NewBag(),
 	})
-	return output.GeneratedFiles
+	if err != nil {
+		return nil, err
+	}
+	return output.GeneratedFiles, nil
 }
 
 func (compilation *Compilation) invokeBackend(
@@ -156,6 +169,7 @@ func (compilation *Compilation) invokeBackend(
 	backendId := compilation.Backend
 	chosenBackend, ok := backend.LookupInIsolate(isolate, backendId)
 	if ok {
+		log.Printf("compiling files with %s backend", backendId)
 		return chosenBackend.Generate(input)
 	}
 	return backend.Output{}, fmt.Errorf("no such backend: %s", backendId)

pkg/compiler/diagnostic/diagnostics.go

@@ -12,12 +12,3 @@ func (diagnostics *Diagnostics) ListEntries() (values []Entry) {
 	}
 	return values
 }
-
-func (diagnostics *Diagnostics) PrintEntries(printer Printer) {
-	for _, entries := range diagnostics.entries {
-		for _, entry := range entries {
-			entry.PrintColored(printer)
-		}
-		printer.PrintLine("")
-	}
-}