Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions pkg/corset/compiler/allocation.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ func (r *Register) Name() string {
})
//
for i, source := range r.Sources {
names[i] = constructColumnName(source)
// FIXME: below is used instead of above in order to replicate the original
// Corset tool. Eventually, this behaviour should be deprecated.
names[i] = source.Name.Tail()
}
// Construct register name from list of names
name := constructRegisterName(names)
Expand All @@ -110,15 +112,6 @@ func (r *Register) Name() string {
return *r.cached_name
}

// Construct a suitable column name from a given register source. We need to
// include the perspective name here in order to avoid name clashes between
// columns with the same name defined in different columns.
func constructColumnName(source RegisterSource) string {
name := fmt.Sprintf("%s%s", source.Perspective(), source.Name.Tail())
// Normalise name
return strings.ReplaceAll(name, "/", "")
}

// A simple algorithm for joining names together.
func constructRegisterName(names []string) string {
str := ""
Expand Down
14 changes: 7 additions & 7 deletions testdata/array_08.accepts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ "m1.SEL": [], "m1.testBYTE_1": [], "m1.testBYTE_2": [] }
{ "m1.SEL": [0], "m1.testBYTE_1": [0], "m1.testBYTE_2": [0] }
{ "m1.SEL": [0], "m1.testBYTE_1": [0], "m1.testBYTE_2": [1] }
{ "m1.SEL": [0], "m1.testBYTE_1": [1], "m1.testBYTE_2": [0] }
{ "m1.SEL": [0], "m1.testBYTE_1": [1], "m1.testBYTE_2": [1] }
{ "m1.SEL": [1], "m1.testBYTE_1": [0], "m1.testBYTE_2": [0] }
{ "m1.SEL": [1], "m1.testBYTE_1": [0], "m1.testBYTE_2": [1] }
{ "m1.SEL": [], "m1.BYTE_1": [], "m1.BYTE_2": [] }
{ "m1.SEL": [0], "m1.BYTE_1": [0], "m1.BYTE_2": [0] }
{ "m1.SEL": [0], "m1.BYTE_1": [0], "m1.BYTE_2": [1] }
{ "m1.SEL": [0], "m1.BYTE_1": [1], "m1.BYTE_2": [0] }
{ "m1.SEL": [0], "m1.BYTE_1": [1], "m1.BYTE_2": [1] }
{ "m1.SEL": [1], "m1.BYTE_1": [0], "m1.BYTE_2": [0] }
{ "m1.SEL": [1], "m1.BYTE_1": [0], "m1.BYTE_2": [1] }
4 changes: 2 additions & 2 deletions testdata/array_08.rejects
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{ "m1.SEL": [1], "m1.testBYTE_1": [1], "m1.testBYTE_2": [0] }
{ "m1.SEL": [1], "m1.testBYTE_1": [1], "m1.testBYTE_2": [1] }
{ "m1.SEL": [1], "m1.BYTE_1": [1], "m1.BYTE_2": [0] }
{ "m1.SEL": [1], "m1.BYTE_1": [1], "m1.BYTE_2": [1] }
Binary file modified testdata/exp.accepts.bz2
Binary file not shown.
10 changes: 5 additions & 5 deletions testdata/interleave_05.accepts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ "P": [], "X": [], "p1Y": [] }
{ "P": [1], "X": [0], "p1Y": [0] }
{ "P": [1,1], "X": [0,0], "p1Y": [0,0] }
{ "P": [1,1,1], "X": [0,0,0], "p1Y": [0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [0,0,0,0] }
{ "P": [], "X": [], "Y": [] }
{ "P": [1], "X": [0], "Y": [0] }
{ "P": [1,1], "X": [0,0], "Y": [0,0] }
{ "P": [1,1,1], "X": [0,0,0], "Y": [0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [0,0,0,0] }
24 changes: 12 additions & 12 deletions testdata/interleave_05.rejects
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{ "P": [1], "X": [1], "p1Y": [0] }
{ "P": [1], "X": [0], "p1Y": [1] }
{ "P": [1,1], "X": [0,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,0], "p1Y": [1,0] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,0] }
{ "P": [1,1], "X": [1,0], "p1Y": [0,0] }
{ "P": [1], "X": [1], "Y": [0] }
{ "P": [1], "X": [0], "Y": [1] }
{ "P": [1,1], "X": [0,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,0], "Y": [1,0] }
{ "P": [1,1], "X": [0,1], "Y": [0,0] }
{ "P": [1,1], "X": [1,0], "Y": [0,0] }
;;
{ "P": [1,1], "X": [1,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,1] }
{ "P": [1,1], "X": [1,0], "p1Y": [1,0] }
{ "P": [1,1], "X": [0,1], "p1Y": [1,0] }
{ "P": [1,1], "X": [1,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,1] }
{ "P": [1,1], "X": [1,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,1], "Y": [0,1] }
{ "P": [1,1], "X": [1,0], "Y": [1,0] }
{ "P": [1,1], "X": [0,1], "Y": [1,0] }
{ "P": [1,1], "X": [1,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,1], "Y": [0,1] }
50 changes: 25 additions & 25 deletions testdata/interleave_06.accepts
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{ "P": [], "X": [], "p1Y": [] }
{ "P": [1], "X": [0], "p1Y": [0] }
{ "P": [1,1], "X": [0,0], "p1Y": [0,0] }
{ "P": [1,1,1], "X": [0,0,0], "p1Y": [0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,1,0,0], "p1Y": [0,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [0,0,1,0] }
{ "P": [1,0,0,1], "X": [0,1,0,0], "p1Y": [0,0,1,0] }
{ "P": [0,1,0,1], "X": [1,0,0,0], "p1Y": [0,0,1,0] }
{ "P": [], "X": [], "Y": [] }
{ "P": [1], "X": [0], "Y": [0] }
{ "P": [1,1], "X": [0,0], "Y": [0,0] }
{ "P": [1,1,1], "X": [0,0,0], "Y": [0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,1,0,0], "Y": [0,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [0,0,1,0] }
{ "P": [1,0,0,1], "X": [0,1,0,0], "Y": [0,0,1,0] }
{ "P": [0,1,0,1], "X": [1,0,0,0], "Y": [0,0,1,0] }
;;
{ "P": [0], "X": [1], "p1Y": [0] }
{ "P": [0], "X": [0], "p1Y": [1] }
{ "P": [0,0], "X": [0,0], "p1Y": [0,1] }
{ "P": [1,0], "X": [0,0], "p1Y": [0,1] }
{ "P": [0,0], "X": [0,0], "p1Y": [1,0] }
{ "P": [0,1], "X": [0,0], "p1Y": [1,0] }
{ "P": [0,0], "X": [0,1], "p1Y": [0,0] }
{ "P": [1,0], "X": [0,1], "p1Y": [0,0] }
{ "P": [0,0], "X": [1,0], "p1Y": [0,0] }
{ "P": [0,1], "X": [1,0], "p1Y": [0,0] }
{ "P": [0], "X": [1], "Y": [0] }
{ "P": [0], "X": [0], "Y": [1] }
{ "P": [0,0], "X": [0,0], "Y": [0,1] }
{ "P": [1,0], "X": [0,0], "Y": [0,1] }
{ "P": [0,0], "X": [0,0], "Y": [1,0] }
{ "P": [0,1], "X": [0,0], "Y": [1,0] }
{ "P": [0,0], "X": [0,1], "Y": [0,0] }
{ "P": [1,0], "X": [0,1], "Y": [0,0] }
{ "P": [0,0], "X": [1,0], "Y": [0,0] }
{ "P": [0,1], "X": [1,0], "Y": [0,0] }
;;
{ "P": [0,0], "X": [1,0], "p1Y": [0,1] }
{ "P": [0,0], "X": [0,1], "p1Y": [0,1] }
{ "P": [0,0], "X": [1,0], "p1Y": [1,0] }
{ "P": [0,0], "X": [0,1], "p1Y": [1,0] }
{ "P": [0,0], "X": [1,0], "p1Y": [0,1] }
{ "P": [0,0], "X": [0,1], "p1Y": [0,1] }
{ "P": [0,0], "X": [1,0], "Y": [0,1] }
{ "P": [0,0], "X": [0,1], "Y": [0,1] }
{ "P": [0,0], "X": [1,0], "Y": [1,0] }
{ "P": [0,0], "X": [0,1], "Y": [1,0] }
{ "P": [0,0], "X": [1,0], "Y": [0,1] }
{ "P": [0,0], "X": [0,1], "Y": [0,1] }
74 changes: 37 additions & 37 deletions testdata/interleave_06.rejects
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
{ "P": [1], "X": [1], "p1Y": [0] }
{ "P": [1], "X": [0], "p1Y": [1] }
{ "P": [1,1], "X": [0,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,0], "p1Y": [1,0] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,0] }
{ "P": [1,1], "X": [1,0], "p1Y": [0,0] }
{ "P": [1], "X": [1], "Y": [0] }
{ "P": [1], "X": [0], "Y": [1] }
{ "P": [1,1], "X": [0,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,0], "Y": [1,0] }
{ "P": [1,1], "X": [0,1], "Y": [0,0] }
{ "P": [1,1], "X": [1,0], "Y": [0,0] }
;;
{ "P": [1,1], "X": [1,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,1] }
{ "P": [1,1], "X": [1,0], "p1Y": [1,0] }
{ "P": [1,1], "X": [0,1], "p1Y": [1,0] }
{ "P": [1,1], "X": [1,0], "p1Y": [0,1] }
{ "P": [1,1], "X": [0,1], "p1Y": [0,1] }
{ "P": [1,1], "X": [1,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,1], "Y": [0,1] }
{ "P": [1,1], "X": [1,0], "Y": [1,0] }
{ "P": [1,1], "X": [0,1], "Y": [1,0] }
{ "P": [1,1], "X": [1,0], "Y": [0,1] }
{ "P": [1,1], "X": [0,1], "Y": [0,1] }
;;
{ "P": [1,1,1,1], "X": [1,0,0,0], "p1Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,1,0,0], "p1Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,1,0], "p1Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,1], "p1Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [1,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [0,1,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [0,0,1,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "p1Y": [0,0,0,1] }
{ "P": [1,1,1,1], "X": [0,0,0,1], "p1Y": [1,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,1,0], "p1Y": [0,1,0,0] }
{ "P": [1,1,1,1], "X": [0,1,0,0], "p1Y": [0,0,1,0] }
{ "P": [1,1,1,1], "X": [1,0,0,0], "p1Y": [0,0,0,1] }
{ "P": [1,1,1,1], "X": [1,0,0,0], "Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,1,0,0], "Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,1,0], "Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,1], "Y": [0,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [1,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [0,1,0,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [0,0,1,0] }
{ "P": [1,1,1,1], "X": [0,0,0,0], "Y": [0,0,0,1] }
{ "P": [1,1,1,1], "X": [0,0,0,1], "Y": [1,0,0,0] }
{ "P": [1,1,1,1], "X": [0,0,1,0], "Y": [0,1,0,0] }
{ "P": [1,1,1,1], "X": [0,1,0,0], "Y": [0,0,1,0] }
{ "P": [1,1,1,1], "X": [1,0,0,0], "Y": [0,0,0,1] }
;;
{ "P": [1,0,1,1], "X": [1,0,0,0], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,1,0], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,0,1], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,1,1], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [1,0,1,0], "p1Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [1,0,1,1], "p1Y": [0,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [1,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [0,1,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [1,1,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [0,0,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [1,0,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [0,1,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "p1Y": [1,1,0,1] }
{ "P": [1,0,1,1], "X": [1,0,0,0], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,1,0], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,0,1], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [0,0,1,1], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [1,0,1,0], "Y": [0,0,0,0] }
{ "P": [1,0,1,1], "X": [1,0,1,1], "Y": [0,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [1,0,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [0,1,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [1,1,0,0] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [0,0,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [1,0,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [0,1,0,1] }
{ "P": [1,1,0,1], "X": [0,0,0,0], "Y": [1,1,0,1] }
36 changes: 18 additions & 18 deletions testdata/perspective_01.accepts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ "A": [], "P": [], "Q": [], "p1B_xor_p2C": [] }
{ "A": [], "P": [], "Q": [], "B_xor_C": [] }
;;
{ "A": [0], "P": [0], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [0], "P": [0], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [1], "P": [0], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [1], "P": [0], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [2], "P": [0], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [2], "P": [0], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [3], "P": [0], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [3], "P": [0], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [55], "P": [0], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [0], "P": [0], "Q": [0], "B_xor_C": [0] }
{ "A": [0], "P": [0], "Q": [0], "B_xor_C": [1] }
{ "A": [1], "P": [0], "Q": [0], "B_xor_C": [0] }
{ "A": [1], "P": [0], "Q": [0], "B_xor_C": [1] }
{ "A": [2], "P": [0], "Q": [0], "B_xor_C": [0] }
{ "A": [2], "P": [0], "Q": [0], "B_xor_C": [1] }
{ "A": [3], "P": [0], "Q": [0], "B_xor_C": [0] }
{ "A": [3], "P": [0], "Q": [0], "B_xor_C": [1] }
{ "A": [55], "P": [0], "Q": [0], "B_xor_C": [1] }
;; perspective p1
{ "A": [0], "P": [1], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [1], "P": [1], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [0], "P": [1], "Q": [0], "B_xor_C": [0] }
{ "A": [1], "P": [1], "Q": [0], "B_xor_C": [1] }
;; perspective p2
{ "A": [0], "P": [0], "Q": [1], "p1B_xor_p2C": [0] }
{ "A": [0], "P": [0], "Q": [1], "p1B_xor_p2C": [1] }
{ "A": [1], "P": [0], "Q": [1], "p1B_xor_p2C": [0] }
{ "A": [2], "P": [0], "Q": [1], "p1B_xor_p2C": [0] }
{ "A": [3], "P": [0], "Q": [1], "p1B_xor_p2C": [0] }
{ "A": [55], "P": [0], "Q": [1], "p1B_xor_p2C": [0] }
{ "A": [0], "P": [0], "Q": [1], "B_xor_C": [0] }
{ "A": [0], "P": [0], "Q": [1], "B_xor_C": [1] }
{ "A": [1], "P": [0], "Q": [1], "B_xor_C": [0] }
{ "A": [2], "P": [0], "Q": [1], "B_xor_C": [0] }
{ "A": [3], "P": [0], "Q": [1], "B_xor_C": [0] }
{ "A": [55], "P": [0], "Q": [1], "B_xor_C": [0] }
42 changes: 21 additions & 21 deletions testdata/perspective_01.rejects
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ "A": [0], "P": [1], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [0], "P": [1], "Q": [0], "p1B_xor_p2C": [2] }
{ "A": [0], "P": [1], "Q": [0], "p1B_xor_p2C": [3] }
{ "A": [1], "P": [1], "Q": [0], "p1B_xor_p2C": [2] }
{ "A": [1], "P": [1], "Q": [0], "p1B_xor_p2C": [3] }
{ "A": [1], "P": [1], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [2], "P": [1], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [2], "P": [1], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [2], "P": [1], "Q": [0], "p1B_xor_p2C": [3] }
{ "A": [3], "P": [1], "Q": [0], "p1B_xor_p2C": [0] }
{ "A": [3], "P": [1], "Q": [0], "p1B_xor_p2C": [1] }
{ "A": [3], "P": [1], "Q": [0], "p1B_xor_p2C": [2] }
{ "A": [1], "P": [0], "Q": [1], "p1B_xor_p2C": [1] }
{ "A": [1], "P": [0], "Q": [1], "p1B_xor_p2C": [2] }
{ "A": [1], "P": [0], "Q": [1], "p1B_xor_p2C": [3] }
{ "A": [2], "P": [0], "Q": [1], "p1B_xor_p2C": [1] }
{ "A": [2], "P": [0], "Q": [1], "p1B_xor_p2C": [2] }
{ "A": [2], "P": [0], "Q": [1], "p1B_xor_p2C": [3] }
{ "A": [3], "P": [0], "Q": [1], "p1B_xor_p2C": [1] }
{ "A": [3], "P": [0], "Q": [1], "p1B_xor_p2C": [2] }
{ "A": [3], "P": [0], "Q": [1], "p1B_xor_p2C": [3] }
{ "A": [0], "P": [1], "Q": [0], "B_xor_C": [1] }
{ "A": [0], "P": [1], "Q": [0], "B_xor_C": [2] }
{ "A": [0], "P": [1], "Q": [0], "B_xor_C": [3] }
{ "A": [1], "P": [1], "Q": [0], "B_xor_C": [2] }
{ "A": [1], "P": [1], "Q": [0], "B_xor_C": [3] }
{ "A": [1], "P": [1], "Q": [0], "B_xor_C": [0] }
{ "A": [2], "P": [1], "Q": [0], "B_xor_C": [0] }
{ "A": [2], "P": [1], "Q": [0], "B_xor_C": [1] }
{ "A": [2], "P": [1], "Q": [0], "B_xor_C": [3] }
{ "A": [3], "P": [1], "Q": [0], "B_xor_C": [0] }
{ "A": [3], "P": [1], "Q": [0], "B_xor_C": [1] }
{ "A": [3], "P": [1], "Q": [0], "B_xor_C": [2] }
{ "A": [1], "P": [0], "Q": [1], "B_xor_C": [1] }
{ "A": [1], "P": [0], "Q": [1], "B_xor_C": [2] }
{ "A": [1], "P": [0], "Q": [1], "B_xor_C": [3] }
{ "A": [2], "P": [0], "Q": [1], "B_xor_C": [1] }
{ "A": [2], "P": [0], "Q": [1], "B_xor_C": [2] }
{ "A": [2], "P": [0], "Q": [1], "B_xor_C": [3] }
{ "A": [3], "P": [0], "Q": [1], "B_xor_C": [1] }
{ "A": [3], "P": [0], "Q": [1], "B_xor_C": [2] }
{ "A": [3], "P": [0], "Q": [1], "B_xor_C": [3] }
54 changes: 27 additions & 27 deletions testdata/perspective_02.accepts
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
{ "A": [], "P": [], "Q": [], "p1B": [], "p2C": [] }
{ "A": [], "P": [], "Q": [], "B": [], "C": [] }
;;
{ "A": [0], "P": [0], "Q": [0], "p1B": [0], "p2C": [0] }
{ "A": [0], "P": [0], "Q": [0], "p1B": [1], "p2C": [2] }
{ "A": [1], "P": [0], "Q": [0], "p1B": [1], "p2C": [2] }
{ "A": [2], "P": [0], "Q": [0], "p1B": [1], "p2C": [1] }
{ "A": [3], "P": [0], "Q": [0], "p1B": [1], "p2C": [1] }
{ "A": [3], "P": [0], "Q": [0], "p1B": [0], "p2C": [2] }
{ "A": [0], "P": [0], "Q": [0], "B": [0], "C": [0] }
{ "A": [0], "P": [0], "Q": [0], "B": [1], "C": [2] }
{ "A": [1], "P": [0], "Q": [0], "B": [1], "C": [2] }
{ "A": [2], "P": [0], "Q": [0], "B": [1], "C": [1] }
{ "A": [3], "P": [0], "Q": [0], "B": [1], "C": [1] }
{ "A": [3], "P": [0], "Q": [0], "B": [0], "C": [2] }
;; perspective p1
{ "A": [0], "P": [1], "Q": [0], "p1B": [0], "p2C": [3] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [1], "p2C": [2] }
{ "A": [0], "P": [1], "Q": [0], "p1B": [0], "p2C": [32] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [1], "p2C": [21] }
{ "A": [0], "P": [1], "Q": [0], "p1B": [0], "p2C": [90] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [1], "p2C": [88] }
{ "A": [0], "P": [1], "Q": [0], "p1B": [0], "p2C": [123] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [1], "p2C": [198] }
{ "A": [0], "P": [1], "Q": [0], "B": [0], "C": [3] }
{ "A": [1], "P": [1], "Q": [0], "B": [1], "C": [2] }
{ "A": [0], "P": [1], "Q": [0], "B": [0], "C": [32] }
{ "A": [1], "P": [1], "Q": [0], "B": [1], "C": [21] }
{ "A": [0], "P": [1], "Q": [0], "B": [0], "C": [90] }
{ "A": [1], "P": [1], "Q": [0], "B": [1], "C": [88] }
{ "A": [0], "P": [1], "Q": [0], "B": [0], "C": [123] }
{ "A": [1], "P": [1], "Q": [0], "B": [1], "C": [198] }
;; perspective p2
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [0] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [1] }
{ "A": [1], "P": [0], "Q": [1], "p1B": [1], "p2C": [0] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [2] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [3] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [15] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [18] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [33] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [123] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [188] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [201] }
{ "A": [0], "P": [0], "Q": [1], "p1B": [1], "p2C": [255] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [0] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [1] }
{ "A": [1], "P": [0], "Q": [1], "B": [1], "C": [0] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [2] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [3] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [15] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [18] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [33] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [123] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [188] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [201] }
{ "A": [0], "P": [0], "Q": [1], "B": [1], "C": [255] }
42 changes: 21 additions & 21 deletions testdata/perspective_02.rejects
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{ "A": [0], "P": [1], "Q": [0], "p1B": [1], "p2C": [0] }
{ "A": [0], "P": [1], "Q": [0], "p1B": [2], "p2C": [0] }
{ "A": [0], "P": [1], "Q": [0], "p1B": [3], "p2C": [0] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [2], "p2C": [0] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [3], "p2C": [0] }
{ "A": [1], "P": [1], "Q": [0], "p1B": [0], "p2C": [0] }
{ "A": [2], "P": [1], "Q": [0], "p1B": [0], "p2C": [0] }
{ "A": [2], "P": [1], "Q": [0], "p1B": [1], "p2C": [0] }
{ "A": [2], "P": [1], "Q": [0], "p1B": [3], "p2C": [0] }
{ "A": [3], "P": [1], "Q": [0], "p1B": [0], "p2C": [0] }
{ "A": [3], "P": [1], "Q": [0], "p1B": [1], "p2C": [0] }
{ "A": [3], "P": [1], "Q": [0], "p1B": [2], "p2C": [0] }
{ "A": [1], "P": [0], "Q": [1], "p1B": [1], "p2C": [1] }
{ "A": [1], "P": [0], "Q": [1], "p1B": [1], "p2C": [2] }
{ "A": [1], "P": [0], "Q": [1], "p1B": [1], "p2C": [3] }
{ "A": [2], "P": [0], "Q": [1], "p1B": [1], "p2C": [1] }
{ "A": [2], "P": [0], "Q": [1], "p1B": [1], "p2C": [2] }
{ "A": [2], "P": [0], "Q": [1], "p1B": [1], "p2C": [3] }
{ "A": [3], "P": [0], "Q": [1], "p1B": [1], "p2C": [1] }
{ "A": [3], "P": [0], "Q": [1], "p1B": [1], "p2C": [2] }
{ "A": [3], "P": [0], "Q": [1], "p1B": [1], "p2C": [3] }
{ "A": [0], "P": [1], "Q": [0], "B": [1], "C": [0] }
{ "A": [0], "P": [1], "Q": [0], "B": [2], "C": [0] }
{ "A": [0], "P": [1], "Q": [0], "B": [3], "C": [0] }
{ "A": [1], "P": [1], "Q": [0], "B": [2], "C": [0] }
{ "A": [1], "P": [1], "Q": [0], "B": [3], "C": [0] }
{ "A": [1], "P": [1], "Q": [0], "B": [0], "C": [0] }
{ "A": [2], "P": [1], "Q": [0], "B": [0], "C": [0] }
{ "A": [2], "P": [1], "Q": [0], "B": [1], "C": [0] }
{ "A": [2], "P": [1], "Q": [0], "B": [3], "C": [0] }
{ "A": [3], "P": [1], "Q": [0], "B": [0], "C": [0] }
{ "A": [3], "P": [1], "Q": [0], "B": [1], "C": [0] }
{ "A": [3], "P": [1], "Q": [0], "B": [2], "C": [0] }
{ "A": [1], "P": [0], "Q": [1], "B": [1], "C": [1] }
{ "A": [1], "P": [0], "Q": [1], "B": [1], "C": [2] }
{ "A": [1], "P": [0], "Q": [1], "B": [1], "C": [3] }
{ "A": [2], "P": [0], "Q": [1], "B": [1], "C": [1] }
{ "A": [2], "P": [0], "Q": [1], "B": [1], "C": [2] }
{ "A": [2], "P": [0], "Q": [1], "B": [1], "C": [3] }
{ "A": [3], "P": [0], "Q": [1], "B": [1], "C": [1] }
{ "A": [3], "P": [0], "Q": [1], "B": [1], "C": [2] }
{ "A": [3], "P": [0], "Q": [1], "B": [1], "C": [3] }
Loading