Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Lustrec - public version
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

ca88e660

Commit ca88e660 authored 9 years ago by Pierre Loic Garoche

Downloads
- Patches
- Plain Diff

Resolved conflict when merging salsa with horn_encoding. The current branch is the most updated.

parent f0bff3e5

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/_tags 2 additions, 6 deletions

src/_tags
src/backends/Horn/horn_backend.ml 3 additions, 3 deletions

src/backends/Horn/horn_backend.ml
src/backends/Horn/horn_backend_collecting_sem.ml 1 addition, 1 deletion

src/backends/Horn/horn_backend_collecting_sem.ml
src/backends/Horn/horn_backend_printers.ml 10 additions, 10 deletions

src/backends/Horn/horn_backend_printers.ml
src/lustreSpec.ml 1 addition, 0 deletions

src/lustreSpec.ml
src/machine_code.ml 0 additions, 104 deletions

src/machine_code.ml
src/main_lustre_compiler.ml 138 additions, 488 deletions

src/main_lustre_compiler.ml
src/optimize_machine.ml 14 additions, 16 deletions

src/optimize_machine.ml

with 169 additions and 628 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment