Skip to content

Commit 6fc0594

Browse files
committed
revert: revert builder.linearExpression method
1 parent e7711d3 commit 6fc0594

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

frontend/cs/r1cs/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ func (builder *builder) Println(a ...frontend.Variable) {
599599
if i > 0 {
600600
sbb.WriteByte(' ')
601601
}
602-
if v, ok := builder.linearExpression(arg); ok {
602+
if v, ok := arg.(expr.LinearExpression); ok {
603603
assertIsSet(v)
604604

605605
sbb.WriteString("%s")

frontend/cs/r1cs/api_assertions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (builder *builder) AssertIsBoolean(i1 frontend.Variable) {
8383
func (builder *builder) AssertIsLessOrEqual(_v frontend.Variable, bound frontend.Variable) {
8484
v := builder.toVariable(_v)
8585

86-
if b, ok := builder.linearExpression(bound); ok {
86+
if b, ok := bound.(expr.LinearExpression); ok {
8787
assertIsSet(b)
8888
builder.mustBeLessOrEqVar(v, b)
8989
} else {

frontend/cs/r1cs/builder.go

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func (builder *builder) MarkBoolean(v frontend.Variable) {
215215
return
216216
}
217217
// v is a linear expression
218-
l, _ := builder.linearExpression(v)
218+
l := v.(expr.LinearExpression)
219219
sort.Sort(l)
220220

221221
key := l.HashCode()
@@ -232,7 +232,7 @@ func (builder *builder) IsBoolean(v frontend.Variable) bool {
232232
return (builder.isCstZero(&b) || builder.isCstOne(&b))
233233
}
234234
// v is a linear expression
235-
l, _ := builder.linearExpression(v)
235+
l := v.(expr.LinearExpression)
236236
sort.Sort(l)
237237

238238
key := l.HashCode()
@@ -285,7 +285,7 @@ func (builder *builder) ConstantValue(v frontend.Variable) (*big.Int, bool) {
285285
}
286286

287287
func (builder *builder) constantValue(v frontend.Variable) (constraint.Coeff, bool) {
288-
if _v, ok := builder.linearExpression(v); ok {
288+
if _v, ok := v.(expr.LinearExpression); ok {
289289
assertIsSet(_v)
290290

291291
if len(_v) != 1 {
@@ -361,7 +361,7 @@ func (builder *builder) NewHint(f hint.Function, nbOutputs int, inputs ...fronte
361361
// TODO @gbotrel hint input pass
362362
// ensure inputs are set and pack them in a []uint64
363363
for i, in := range inputs {
364-
if t, ok := builder.linearExpression(in); ok {
364+
if t, ok := in.(expr.LinearExpression); ok {
365365
assertIsSet(t)
366366
hintInputs[i] = builder.getLinearExpression(t)
367367
} else {
@@ -449,13 +449,3 @@ func (builder *builder) compress(le expr.LinearExpression) expr.LinearExpression
449449
builder.cs.AddConstraint(builder.newR1C(le, one, t))
450450
return t
451451
}
452-
453-
func (builder *builder) linearExpression(v frontend.Variable) (expr.LinearExpression, bool) {
454-
switch t := v.(type) {
455-
case expr.LinearExpression:
456-
return t, true
457-
case *expr.LinearExpression:
458-
return *t, true
459-
}
460-
return nil, false
461-
}

0 commit comments

Comments
 (0)