refactor(pumpkin-solver): Use the `fzn-rs` package instead of `flatzinc` #258

maartenflippo · 2025-07-25T13:30:25Z

We migrate to the fzn-rs package, which extracts much of the parsing of flatzinc files to a separate crate.

Todo

Merge feat: Introducing fzn-rs, a better FlatZinc parser that is easier to re-use across projects #238
Change base to main

…d solve items

…d solve

…he solve item in TypedInstance

…ation

…assigned

The Rc is not Send, but popular crates like anyhow do expect errors to be Send. Since these are errors, we pay the price to allocate a String instead.

… fzn-rs" This reverts commit 8c5b945.

…-fzn-rs" This reverts commit f760140, reversing changes made to a49eea9.

Review re-requested

EmirDe · 2025-10-02T12:51:16Z

let mut typed_ast
For Pumpkin, comments on the compile stages

ImkoMarijnissen

Only went through the changes in pumpkin-solver

ImkoMarijnissen · 2025-11-26T08:24:53Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/collect_domains.rs

            }
+
+            ast::Domain::UnboundedInt => {
+                return Err(FlatZincError::UnsupportedVariable(name.as_ref().into()))


We now "support" this

ImkoMarijnissen · 2025-11-26T08:26:15Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/context.rs

+    // A literal which is always true, can be used when using bool constants in the solver
+    // pub(crate) constant_bool_true: BooleanDomainId,
+    // A literal which is always false, can be used when using bool constants in the solver
+    // pub(crate) constant_bool_false: BooleanDomainId,


This commented out code can be removed

ImkoMarijnissen · 2025-11-26T08:28:49Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/context.rs

+        instance
+            .resolve_array(array)
+            .map_err(|err| FlatZincError::UndefinedArray(err.0))?
+            .map(|maybe_int| maybe_int.map_err(FlatZincError::from))


To me this is a bit vague; why could this be an int?

ImkoMarijnissen · 2025-11-26T08:37:30Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/identify_output_arrays.rs

Other compiler files have some documentation using //! that specifies the overall purpose of the file; would be nice to include that here as well

ImkoMarijnissen · 2025-11-26T08:40:26Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/identify_output_arrays.rs

+    instance: &Instance,
+    context: &mut CompilationContext,
+) -> Result<(), FlatZincError> {
+    for (name, array) in &instance.arrays {


Is this something that we previously did not support or did we just handle it in a different way previously?

ImkoMarijnissen · 2025-11-26T08:42:23Z

pumpkin-solver/src/bin/pumpkin-solver/flatzinc/compiler/merge_equivalences.rs

+            ast::Domain::UnboundedInt => {
+                return Err(FlatZincError::UnsupportedVariable(name.as_ref().into()))


Not unsupported anymore

maartenflippo added 30 commits July 24, 2025 11:53

feat(fzn-rs): Started working on a more ergonomic

b9dd50f

feat(fzn-rs): Implement first go at the derive macro

8f5c966

fix(fzn-rs): Don't panic in an error case, but emit a compiler error

442a6b6

refactor(fzn-rs): Attach spans to AST in preparation for error messages

f41d13b

refactor(fzn-rs): Simplify the code generation code

316dbea

feat(fzn-rs): Improve error messages when parsing instance

92aa520

feat(fzn-rs): Resolve arrays from the AST

63d013d

refactor(fzn-rs): Cleanup implementation and add documentation

da96b0f

docs(fzn-rs): Add root module documentation to fzn-rs

b4a9bb9

feat(fzn-rs): Explicitly set the name of a constraint in derive macro

f61f065

feat(fzn-rs): Implement a basic FZN parser, without annotation support

e112887

refactor(fzn-rs): Update documentation and generalize variable arguments

1a2b78f

feat(fzn-rs): Start implemented typed annotation parsing

713715c

feat(fzn-rs): Implement parsing of nested annotations

265d461

feat(fzn-rs): Allow typed annotations on the solve item

4a76f3f

feat(fzn-rs): Implement array annotation arguments

4e899d9

refactor(fzn-rs): Implement parsing of comments

47be477

feat(fzn-rs): Parse annotations in variables, arrays, constraints, an…

938be6e

…d solve items

feat(fzn-rs): Ignore predicate declarations in flatzinc

70b202b

feat(fzn-rs): Allow constraint arguments to be separate structs

54fdfc8

docs(fzn-rs): Add example with constraint args as separate struct

a60b0b2

refactor(fzn-rs): Replace '_' with '-' in crate names

6c47fd0

refactor(fzn-rs): Separate annotations for variables, constraints, an…

b8fba22

…d solve

feat(fzn-rs): Parse annotation arguments in struct

a06b90f

feat(fzn-rs): Implement RangeList::iter for i64 elements

07a1ca5

feat(fzn-rs): Implement support for i32 as an integer type

0281a3c

refactor(fzn-rs): Remove redundent function

f064a8c

refactor(fzn-rs): Rename VariableArg to VariableExpr, and use it as t…

b3e68da

…he solve item in TypedInstance

refactor(fzn-rs): Clean up the implementation into modules + document…

aa3bead

…ation

fix(fzn-rs): Fix numerous compiler issues after previous refactor

a67c74a

refactor: Update cargo.lock

438aa3b

maartenflippo force-pushed the feat/improved-fzn-parser branch from 945b37e to 438aa3b Compare August 13, 2025 20:16

maartenflippo marked this pull request as ready for review August 13, 2025 21:04

maartenflippo added 5 commits August 15, 2025 20:58

feat(fzn-rs): Implement parsing of the domain of array elements

fc9e7f8

Merge branch 'feat/improved-fzn-parser' into feat/pumpkin-use-fzn-rs

d9a48e4

fix: Warm start annotations

b0ad0ca

refactor(pumpkin-solver): Fix identification of output arrays

2c85f16

refactor(pumpkin-solver): Support int_lin_*_imp constraints

244b353

maartenflippo force-pushed the feat/pumpkin-use-fzn-rs branch from 898a593 to 244b353 Compare August 18, 2025 12:38

maartenflippo added 7 commits September 4, 2025 08:34

WIP

0dff70d

fix(pumpkin-solver): Correctly create domain if flatzinc variable is …

eeb8e53

…assigned

refactor(fzn-rs): Move away from using Rc in errors

6be52f2

The Rc is not Send, but popular crates like anyhow do expect errors to be Send. Since these are errors, we pay the price to allocate a String instead.

Merge branch 'feat/improved-fzn-parser' into feat/pumpkin-use-fzn-rs

2b6bfc9

fix(pumpkin-solver): Compiler errors after updating parser

a33363e

feat(fzn-rs): Allow access to error values

25ac7e8

Merge branch 'feat/improved-fzn-parser' into feat/pumpkin-use-fzn-rs

a49eea9

maartenflippo mentioned this pull request Sep 10, 2025

feat: Introducing fzn-rs, a better FlatZinc parser that is easier to re-use across projects #238

Merged

maartenflippo added 5 commits September 10, 2025 15:58

refactor(fzn-rs): Remove the explicit lexing stage from the fzn parser

44cbb24

Merge branch 'feat/improved-fzn-parser' into feat/pumpkin-use-fzn-rs

f760140

refactor(pumpkin-solver): Update to the revised error type in fzn-rs

8c5b945

Revert "refactor(pumpkin-solver): Update to the revised error type in…

9d26f9f

… fzn-rs" This reverts commit 8c5b945.

Revert "Merge branch 'feat/improved-fzn-parser' into feat/pumpkin-use…

c5dd030

…-fzn-rs" This reverts commit f760140, reversing changes made to a49eea9.

maartenflippo requested a review from ImkoMarijnissen September 25, 2025 09:09

maartenflippo force-pushed the feat/improved-fzn-parser branch from cfe2685 to 1ee9455 Compare October 2, 2025 14:38

ImkoMarijnissen requested changes Nov 26, 2025

View reviewed changes

maartenflippo force-pushed the feat/improved-fzn-parser branch from 1ee9455 to 7d97aaf Compare December 10, 2025 10:06

Base automatically changed from feat/improved-fzn-parser to main December 10, 2025 10:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

refactor(pumpkin-solver): Use the `fzn-rs` package instead of `flatzinc` #258

refactor(pumpkin-solver): Use the `fzn-rs` package instead of `flatzinc` #258

Uh oh!

maartenflippo commented Jul 25, 2025 •

edited

Loading

Uh oh!

EmirDe commented Oct 2, 2025

Uh oh!

ImkoMarijnissen left a comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

ImkoMarijnissen Nov 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		ast::Domain::UnboundedInt => {
		return Err(FlatZincError::UnsupportedVariable(name.as_ref().into()))

refactor(pumpkin-solver): Use the fzn-rs package instead of flatzinc #258

Are you sure you want to change the base?

refactor(pumpkin-solver): Use the fzn-rs package instead of flatzinc #258

Uh oh!

Conversation

maartenflippo commented Jul 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Todo

Uh oh!

EmirDe commented Oct 2, 2025

Uh oh!

ImkoMarijnissen left a comment

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

ImkoMarijnissen Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

refactor(pumpkin-solver): Use the `fzn-rs` package instead of `flatzinc` #258

refactor(pumpkin-solver): Use the `fzn-rs` package instead of `flatzinc` #258

maartenflippo commented Jul 25, 2025 •

edited

Loading