Merge branch 'main' into bellmar/swaps

Fault-lang · Apr 14, 2023 · 9e9ecd6 · 9e9ecd6
2 parents 1281fdc + 8d19f1e
commit 9e9ecd6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/listener/listener.go b/listener/listener.go
@@ -53,7 +53,6 @@ func Execute(spec string, path string, flags map[string]bool /*specType bool, te
 	stream := antlr.NewCommonTokenStream(lexer, antlr.TokenDefaultChannel)
 
 	p := parser.NewFaultParser(stream)
-
 	l := NewListener(path, flags["testing"], flags["skipRun"])
 
 	if flags["specType"] {

diff --git a/llvm/compiler.go b/llvm/compiler.go
@@ -105,9 +105,11 @@ func NewCompiler() *Compiler {
 	return c
 }
 
+
 func Execute(tree *ast.Spec, specRec map[string]*preprocess.SpecRecord, uncertains map[string][]float64, unknowns []string, aliases map[string]string, testing bool) *Compiler {
 	compiler := NewCompiler()
 	compiler.LoadMeta(specRec, uncertains, unknowns, aliases, testing)
+
 	err := compiler.Compile(tree)
 	if err != nil {
 		panic(err)
@@ -116,6 +118,7 @@ func Execute(tree *ast.Spec, specRec map[string]*preprocess.SpecRecord, uncertai
 }
 
 func (c *Compiler) LoadMeta(structs map[string]*preprocess.SpecRecord, uncertains map[string][]float64, unknowns []string, aliases map[string]string, test bool) {
+
 	c.specStructs = structs
 	c.Unknowns = unknowns
 	c.Uncertains = uncertains

diff --git a/llvm/llvm_test.go b/llvm/llvm_test.go
@@ -729,12 +729,14 @@ func prepTest(test string, specType bool) (string, error) {
 
 	l := listener.Execute(test, "", flags)
 	pre := preprocess.Execute(l)
+
 	ty := types.Execute(pre.Processed, pre)
 	sw := swaps.NewPrecompiler(ty)
 	tree := sw.Swap(ty.Checked)
 	compiler := NewCompiler()
 	compiler.LoadMeta(ty.SpecStructs, l.Uncertains, l.Unknowns, sw.Alias, true)
 	err := compiler.Compile(tree)
+
 	if err != nil {
 		return "", err
 	}

diff --git a/main.go b/main.go
@@ -23,7 +23,9 @@ import (
 	_ "github.com/olekukonko/tablewriter"
 )
 
+
 func parse(data string, path string, file string, filetype string, reach bool, visu bool) (*ast.Spec, *listener.FaultListener, *types.Checker, string, map[string]string) {
+
 	//Confirm that the filetype and file declaration match
 	if !validate_filetype(data, filetype) {
 		log.Fatalf("malformatted file: declaration does not match filetype.")
@@ -119,8 +121,9 @@ func run(filepath string, mode string, input string, reach bool) {
 			fmt.Println(lstnr.AST)
 			return
 		}
-
+    
 		compiler := llvm.Execute(tree, ty.SpecStructs, lstnr.Uncertains, lstnr.Unknowns, alias, false)
+
 		uncertains = compiler.Uncertains
 		unknowns = compiler.Unknowns
 

diff --git a/preprocess/preprocess_test.go b/preprocess/preprocess_test.go
@@ -273,7 +273,9 @@ func TestRunInstances(t *testing.T) {
 		t.Fatalf("flow property value not correctly named in runblock got=%s", buzz.Properties["foo"].Value.(ast.Nameable).IdString())
 	}
 
+
 	run := process.Processed.Statements[3].(*ast.ForStatement).Inits.Statements[0].(*ast.ExpressionStatement).Expression.(*ast.StructInstance)
+
 	for k, v := range run.Properties {
 		if k == "fizz" {
 			foo := v.Value.(*ast.FunctionLiteral).Body.Statements[0].(*ast.ExpressionStatement).Expression.(*ast.InfixExpression).Left.(*ast.ParameterCall).IdString()

diff --git a/types/types_test.go b/types/types_test.go
@@ -987,6 +987,7 @@ func TestSwapError3(t *testing.T) {
 	}
 }
 
+
 func prepTest(test string, specType bool) (*Checker, error) {
 	flags := make(map[string]bool)
 	flags["specType"] = specType