lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Rename old fail3 variable to failUnify

Browse Source 
Cleanups...
This commit is contained in:
James Shubin
2021-05-08 04:17:21 -04:00
parent 1016699c94
commit d51029e86c
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lang/interpret_test.go
View File

@@ -549,7 +549,7 @@ func TestAstFunc1(t *testing.T) {
const magicErrorLexParse = "errLexParse: " const magicErrorLexParse = "errLexParse: "
const magicErrorFailInit = "errInit: " const magicErrorFailInit = "errInit: "
const magicErrorSetScope = "errSetScope: " const magicErrorSetScope = "errSetScope: "
const magicError3 = "err3: " const magicErrorUnify = "errUnify: "
const magicError4 = "err4: " const magicError4 = "err4: "
const magicEmpty = "# empty!" const magicEmpty = "# empty!"
dir, err := util.TestDirFull() dir, err := util.TestDirFull()
@@ -582,7 +582,7 @@ func TestAstFunc1(t *testing.T) {
failLexParse bool failLexParse bool
failInit bool failInit bool
failSetScope bool failSetScope bool
fail3 bool failUnify bool
fail4 bool fail4 bool
} }
type test struct { // an individual test type test struct { // an individual test
@@ -639,7 +639,7 @@ func TestAstFunc1(t *testing.T) {
failLexParse := false failLexParse := false
failInit := false failInit := false
failSetScope := false failSetScope := false
fail3 := false failUnify := false
fail4 := false fail4 := false
if strings.HasPrefix(str, magicError) { if strings.HasPrefix(str, magicError) {
errStr = strings.TrimPrefix(str, magicError) errStr = strings.TrimPrefix(str, magicError)
@@ -660,10 +660,10 @@ func TestAstFunc1(t *testing.T) {
str = errStr str = errStr
failSetScope = true failSetScope = true
} }
if strings.HasPrefix(str, magicError3) { if strings.HasPrefix(str, magicErrorUnify) {
errStr = strings.TrimPrefix(str, magicError3) errStr = strings.TrimPrefix(str, magicErrorUnify)
str = errStr str = errStr
fail3 = true failUnify = true
} }
if strings.HasPrefix(str, magicError4) { if strings.HasPrefix(str, magicError4) {
errStr = strings.TrimPrefix(str, magicError4) errStr = strings.TrimPrefix(str, magicError4)
@@ -682,7 +682,7 @@ func TestAstFunc1(t *testing.T) {
failLexParse: failLexParse, failLexParse: failLexParse,
failInit: failInit, failInit: failInit,
failSetScope: failSetScope, failSetScope: failSetScope,
fail3: fail3, failUnify: failUnify,
fail4: fail4, fail4: fail4,
}, },
}) })
@@ -720,7 +720,7 @@ func TestAstFunc1(t *testing.T) {
failLexParse := errs.failLexParse failLexParse := errs.failLexParse
failInit := errs.failInit failInit := errs.failInit
failSetScope := errs.failSetScope failSetScope := errs.failSetScope
fail3 := errs.fail3 failUnify := errs.failUnify
fail4 := errs.fail4 fail4 := errs.fail4
t.Logf("\n\ntest #%d (%s) ----------------\npath: %s\n\n", index, name, src) t.Logf("\n\ntest #%d (%s) ----------------\npath: %s\n\n", index, name, src)
@@ -891,12 +891,12 @@ func TestAstFunc1(t *testing.T) {
Logf: xlogf, Logf: xlogf,
} }
err = unifier.Unify() err = unifier.Unify()
if (!fail || !fail3) && err != nil { if (!fail || !failUnify) && err != nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: could not unify types: %+v", index, err) t.Errorf("test #%d: could not unify types: %+v", index, err)
return return
} }
if fail3 && err != nil { if failUnify && err != nil {
s := err.Error() // convert to string s := err.Error() // convert to string
if s != expstr { if s != expstr {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
@@ -906,7 +906,7 @@ func TestAstFunc1(t *testing.T) {
} }
return // fail happened during unification, don't run Graph! return // fail happened during unification, don't run Graph!
} }
if fail3 && err == nil { if failUnify && err == nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: unification passed, expected fail", index) t.Errorf("test #%d: unification passed, expected fail", index)
return return
@@ -1003,7 +1003,7 @@ func TestAstFunc2(t *testing.T) {
const magicError8 = "err8: " // TODO: rename const magicError8 = "err8: " // TODO: rename
// TODO: move them all down by one // TODO: move them all down by one
const magicErrorSetScope = "errSetScope: " const magicErrorSetScope = "errSetScope: "
const magicError3 = "err3: " const magicErrorUnify = "errUnify: "
const magicError4 = "err4: " const magicError4 = "err4: "
const magicError5 = "err5: " const magicError5 = "err5: "
const magicError6 = "err6: " const magicError6 = "err6: "
@@ -1040,7 +1040,7 @@ func TestAstFunc2(t *testing.T) {
fail8 bool // TODO: rename fail8 bool // TODO: rename
// TODO: move them all down by one // TODO: move them all down by one
failSetScope bool failSetScope bool
fail3 bool failUnify bool
fail4 bool fail4 bool
fail5 bool fail5 bool
fail6 bool fail6 bool
@@ -1101,7 +1101,7 @@ func TestAstFunc2(t *testing.T) {
fail8 := false // TODO: rename fail8 := false // TODO: rename
// TODO: move them all down by one // TODO: move them all down by one
failSetScope := false failSetScope := false
fail3 := false failUnify := false
fail4 := false fail4 := false
fail5 := false fail5 := false
fail6 := false fail6 := false
@@ -1130,10 +1130,10 @@ func TestAstFunc2(t *testing.T) {
str = errStr str = errStr
failSetScope = true failSetScope = true
} }
if strings.HasPrefix(str, magicError3) { if strings.HasPrefix(str, magicErrorUnify) {
errStr = strings.TrimPrefix(str, magicError3) errStr = strings.TrimPrefix(str, magicErrorUnify)
str = errStr str = errStr
fail3 = true failUnify = true
} }
if strings.HasPrefix(str, magicError4) { if strings.HasPrefix(str, magicError4) {
errStr = strings.TrimPrefix(str, magicError4) errStr = strings.TrimPrefix(str, magicError4)
@@ -1164,7 +1164,7 @@ func TestAstFunc2(t *testing.T) {
fail8: fail8, // TODO: rename fail8: fail8, // TODO: rename
// TODO: move them all down by one // TODO: move them all down by one
failSetScope: failSetScope, failSetScope: failSetScope,
fail3: fail3, failUnify: failUnify,
fail4: fail4, fail4: fail4,
fail5: fail5, fail5: fail5,
fail6: fail6, fail6: fail6,
@@ -1206,7 +1206,7 @@ func TestAstFunc2(t *testing.T) {
fail8 := errs.fail8 // TODO: rename fail8 := errs.fail8 // TODO: rename
// TODO: move them all down by one // TODO: move them all down by one
failSetScope := errs.failSetScope failSetScope := errs.failSetScope
fail3 := errs.fail3 failUnify := errs.failUnify
fail4 := errs.fail4 fail4 := errs.fail4
fail5 := errs.fail5 fail5 := errs.fail5
fail6 := errs.fail6 fail6 := errs.fail6
@@ -1408,12 +1408,12 @@ func TestAstFunc2(t *testing.T) {
Logf: xlogf, Logf: xlogf,
} }
err = unifier.Unify() err = unifier.Unify()
if (!fail || !fail3) && err != nil { if (!fail || !failUnify) && err != nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: could not unify types: %+v", index, err) t.Errorf("test #%d: could not unify types: %+v", index, err)
return return
} }
if fail3 && err != nil { if failUnify && err != nil {
s := err.Error() // convert to string s := err.Error() // convert to string
if s != expstr { if s != expstr {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
@@ -1423,7 +1423,7 @@ func TestAstFunc2(t *testing.T) {
} }
return // fail happened during unification, don't run Graph! return // fail happened during unification, don't run Graph!
} }
if fail3 && err == nil { if failUnify && err == nil {
t.Errorf("test #%d: FAIL", index) t.Errorf("test #%d: FAIL", index)
t.Errorf("test #%d: unification passed, expected fail", index) t.Errorf("test #%d: unification passed, expected fail", index)
return return

2
lang/interpret_test/TestAstFunc1/empty-res-list-0.graph
View File

@@ -1 +1 @@
# err: err3: only recursive solutions left # err: errUnify: only recursive solutions left

2
lang/interpret_test/TestAstFunc1/fail2.graph
View File

@@ -1 +1 @@
# err: err3: can't unify, invariant illogicality with equality: base kind does not match (Str != Int) # err: errUnify: can't unify, invariant illogicality with equality: base kind does not match (Str != Int)

2
lang/interpret_test/TestAstFunc1/polydoubleincludewithtype.graph
View File

@@ -1 +1 @@
# err: err3: can't unify, invariant illogicality with equals: base kind does not match (Str != List) # err: errUnify: can't unify, invariant illogicality with equals: base kind does not match (Str != List)

2
lang/interpret_test/TestAstFunc2/invalid-function-call.output
View File

@@ -1 +1 @@
# err: err3: expected: Func, got: Int # err: errUnify: expected: Func, got: Int

2
lang/interpret_test/TestAstFunc2/printfinterpolate0.output
View File

@@ -1 +1 @@
# err: err3: polymorphic signatures for func `fmt.printf` could not be found: could not determine type from format string # err: errUnify: polymorphic signatures for func `fmt.printf` could not be found: could not determine type from format string

2
lang/interpret_test/TestAstFunc2/send-recv-1.output
View File

@@ -1 +1 @@
# err: err3: cannot send/recv from exec[exec0].shell to file[/tmp/command-output].content: key not found in send struct # err: errUnify: cannot send/recv from exec[exec0].shell to file[/tmp/command-output].content: key not found in send struct