Skip to content

Commit ba3729a

Browse files
committed
Don't require CST origins in BIR
Changing my mind here, but now that I can produce BIR from Maclina bytecode, requiring producers to use CST seems overly narrow.
1 parent 13b6921 commit ba3729a

3 files changed

Lines changed: 4 additions & 11 deletions

File tree

BIR/cleavir-bir.asd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
:bug-tracker "https://github.com/s-expressionists/Cleavir/issues"
1111
:source-control (:git "https://github.com/s-expressionists/Cleavir.git")
1212
:depends-on (:cleavir-primop :cleavir-set :cleavir-attributes
13-
:acclimation :cleavir-conditions :cleavir-ctype
14-
:concrete-syntax-tree)
13+
:acclimation :cleavir-conditions :cleavir-ctype)
1514
:components
1615
((:file "packages")
1716
(:file "structure" :depends-on ("packages"))

BIR/condition-reporters-english.lisp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@
1414
(let ((origin (conditions:origin condition)))
1515
(format stream "The derived type of ~:[<nameless datum>~;~:*~a~]
1616
is ~s~%but is asserted as ~s
17-
by ~a~:[~; in ~s~]."
17+
by ~a."
1818
(name (datum condition))
1919
(derived-type condition)
2020
(asserted-type condition)
21-
(asserted-by condition)
22-
origin
23-
(when origin (cst:raw origin)))))
21+
(asserted-by condition))))
2422

2523
(defun group-problems (problems)
2624
;; Group by subject. Also, put function problems before iblock problems, and

BIR/verify.lisp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,7 @@ If there are problems, a VERIFICATION-FAILED is signaled. If the verification pr
8585
(verify-outputs instruction)
8686
(let ((outputs (outputs instruction)))
8787
(test (or (null outputs) (not (set:presentp outputs *seen-lists*)))
88-
"has shared output list ~a" instruction outputs))
89-
;; verify source info is a CST if it exists
90-
(let ((origin (origin instruction)))
91-
(test (typep origin '(or null cst:cst))
92-
"has invalid origin ~a" instruction origin)))
88+
"has shared output list ~a" instruction outputs)))
9389

9490
(defmethod verify-outputs ((instruction writevar))
9591
(let ((outputs (outputs instruction)))

0 commit comments

Comments
 (0)