Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Syntax for Counter Example #425

Merged
merged 1 commit into from
Dec 10, 2024
Merged

Update Syntax for Counter Example #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/corset/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,5 +917,5 @@ func isIdentifierStart(c rune) bool {
}

func isIdentifierMiddle(c rune) bool {
return unicode.IsDigit(c) || isIdentifierStart(c) || c == '-'
return unicode.IsDigit(c) || isIdentifierStart(c) || c == '-' || c == '!'
}
42 changes: 28 additions & 14 deletions testdata/counter.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
(defpurefun (vanishes! e0) e0)
;;
(defpurefun (next X) (shift X 1))
(defpurefun (prev X) (shift X -1))
;;
(defpurefun (eq! x y) (- x y))
;;
(defpurefun (will-eq! e0 e1) (eq! (next e0) e1))
(defpurefun (will-inc! e0 offset) (will-eq! e0 (+ e0 offset)))
(defpurefun (will-remain-constant! e0) (will-eq! e0 e0))
;;
(defpurefun (if-eq-else x val then else) (if (eq! x val) then else))

;; ===================================================
;; Constraints
;; ===================================================
(defcolumns STAMP CT)

;; In the first row, STAMP is always zero. This allows for an
Expand All @@ -6,30 +22,28 @@

;; In the last row of a valid frame, the counter must have its max
;; value. This ensures that all non-padding frames are complete.
(defconstraint last (:domain {-1}) (* STAMP (- 3 CT)))
(defconstraint last (:domain {-1} :guard STAMP) (eq! CT 3))

;; STAMP either remains constant, or increments by one.
(defconstraint increment () (*
;; STAMP[k] == STAMP[k+1]
(- STAMP (shift STAMP 1))
(will-inc! STAMP 0)
;; Or, STAMP[k]+1 == STAMP[k+1]
(- (+ 1 STAMP) (shift STAMP 1))))
(will-inc! STAMP 1)))

;; If STAMP changes, counter resets to zero.
(defconstraint reset () (*
;; STAMP[k] == STAMP[k+1]
(- STAMP (shift STAMP 1))
(will-remain-constant! STAMP)
;; Or, CT[k+1] == 0
(shift CT 1)))
(vanishes! (next CT))))

;; If STAMP non-zero and reaches end-of-cycle, then stamp increments;
;; otherwise, counter increments.
(defconstraint heartbeat ()
(if STAMP
0
;; If CT == 3
(if (- 3 CT)
;; Then, STAMP[k]+1 == STAMP[k]
(- (+ 1 STAMP) (shift STAMP 1))
;; Else, CT[k]+1 == CT[k]
(- (+ 1 CT) (shift CT 1)))))
(defconstraint heartbeat (:guard STAMP)
;; If CT == 3
(if-eq-else CT 3
;; Then, STAMP[k]+1 == STAMP[k]
(will-inc! STAMP 1)
;; Else, CT[k]+1 == CT[k]
(will-inc! CT 1)))
Loading