Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
;;; comp-cstr.el --- native compiler constraint library -*- lexical-binding: t -*-
|
|
|
|
|
|
|
|
|
|
;; Author: Andrea Corallo <akrl@sdf.com>
|
|
|
|
|
|
|
|
|
|
;; Copyright (C) 2020 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
|
|
;; Keywords: lisp
|
|
|
|
|
;; Package: emacs
|
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; Constraint library in use by the native compiler.
|
|
|
|
|
|
|
|
|
|
;; In LIMPLE each non immediate value is represented by a `comp-mvar'.
|
|
|
|
|
;; The part concerning the set of all values the `comp-mvar' can
|
|
|
|
|
;; assume is described into its constraint `comp-cstr'. Each
|
|
|
|
|
;; constraint consists in a triplet: type-set, value-set, range-set.
|
|
|
|
|
;; This file provide set operations between constraints (union
|
|
|
|
|
;; intersection and negation) plus routines to convert from and to a
|
|
|
|
|
;; CL like type specifier.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
|
|
(require 'cl-lib)
|
|
|
|
|
|
|
|
|
|
(defconst comp--typeof-types (mapcar (lambda (x)
|
|
|
|
|
(append x '(t)))
|
|
|
|
|
cl--typeof-types)
|
|
|
|
|
;; TODO can we just add t in `cl--typeof-types'?
|
|
|
|
|
"Like `cl--typeof-types' but with t as common supertype.")
|
|
|
|
|
|
|
|
|
|
(defconst comp--all-builtin-types
|
|
|
|
|
(append cl--all-builtin-types '(t))
|
|
|
|
|
"Likewise like `cl--all-builtin-types' but with t as common supertype.")
|
|
|
|
|
|
|
|
|
|
(cl-defstruct (comp-cstr (:constructor comp-type-to-cstr
|
|
|
|
|
(type &aux (typeset (list type))))
|
|
|
|
|
(:constructor comp-value-to-cstr
|
|
|
|
|
(value &aux
|
|
|
|
|
(valset (list value))
|
|
|
|
|
(typeset ())))
|
|
|
|
|
(:constructor comp-irange-to-cstr
|
|
|
|
|
(irange &aux
|
|
|
|
|
(range (list irange))
|
2020-12-05 19:36:00 +01:00
|
|
|
|
(typeset ())))
|
|
|
|
|
(:copier nil))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
"Internal representation of a type/value constraint."
|
|
|
|
|
(typeset '(t) :type list
|
|
|
|
|
:documentation "List of possible types the mvar can assume.
|
|
|
|
|
Each element cannot be a subtype of any other element of this slot.")
|
|
|
|
|
(valset () :type list
|
|
|
|
|
:documentation "List of possible values the mvar can assume.
|
|
|
|
|
Integer values are handled in the `range' slot.")
|
|
|
|
|
(range () :type list
|
2020-12-02 21:44:00 +01:00
|
|
|
|
:documentation "Integer interval.")
|
|
|
|
|
(neg nil :type boolean
|
|
|
|
|
:documentation "Non-nil if the constraint is negated"))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
(cl-defstruct comp-cstr-f
|
|
|
|
|
"Internal constraint representation for a function."
|
|
|
|
|
(args () :type list
|
|
|
|
|
:documentation "List of `comp-cstr' for its arguments.")
|
|
|
|
|
(ret nil :type (or comp-cstr comp-cstr-f)
|
|
|
|
|
:documentation "Returned value."))
|
|
|
|
|
|
|
|
|
|
(cl-defstruct comp-cstr-ctxt
|
|
|
|
|
(union-typesets-mem (make-hash-table :test #'equal) :type hash-table
|
|
|
|
|
:documentation "Serve memoization for
|
|
|
|
|
`comp-union-typesets'.")
|
|
|
|
|
;; TODO we should be able to just cons hash this.
|
|
|
|
|
(common-supertype-mem (make-hash-table :test #'equal) :type hash-table
|
|
|
|
|
:documentation "Serve memoization for
|
2020-12-05 19:36:00 +01:00
|
|
|
|
`comp-common-supertype'.")
|
|
|
|
|
(union-1-mem-no-range (make-hash-table :test #'equal) :type hash-table
|
|
|
|
|
:documentation "Serve memoization for
|
|
|
|
|
`comp-cstr-union-1'.")
|
|
|
|
|
(union-1-mem-range (make-hash-table :test #'equal) :type hash-table
|
|
|
|
|
:documentation "Serve memoization for
|
2020-12-12 20:43:04 +01:00
|
|
|
|
`comp-cstr-union-1'.")
|
|
|
|
|
(intersection-mem (make-hash-table :test #'equal) :type hash-table
|
|
|
|
|
:documentation "Serve memoization for
|
|
|
|
|
`intersection-mem'."))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
2020-12-02 23:48:00 +01:00
|
|
|
|
(defmacro with-comp-cstr-accessors (&rest body)
|
|
|
|
|
"Define some quick accessor to reduce code vergosity in BODY."
|
|
|
|
|
(declare (debug (form body))
|
|
|
|
|
(indent defun))
|
2020-12-16 18:41:18 +01:00
|
|
|
|
`(cl-macrolet ((typeset (x)
|
|
|
|
|
`(comp-cstr-typeset ,x))
|
|
|
|
|
(valset (x)
|
|
|
|
|
`(comp-cstr-valset ,x))
|
|
|
|
|
(range (x)
|
|
|
|
|
`(comp-cstr-range ,x))
|
|
|
|
|
(neg (x)
|
|
|
|
|
`(comp-cstr-neg ,x)))
|
2020-12-02 23:48:00 +01:00
|
|
|
|
,@body))
|
|
|
|
|
|
2020-12-05 19:36:00 +01:00
|
|
|
|
(defun comp-cstr-copy (cstr)
|
|
|
|
|
"Return a deep copy of CSTR."
|
|
|
|
|
(with-comp-cstr-accessors
|
2020-12-23 10:48:29 +01:00
|
|
|
|
(make-comp-cstr :typeset (copy-sequence (typeset cstr))
|
|
|
|
|
:valset (copy-sequence (valset cstr))
|
2020-12-05 19:36:00 +01:00
|
|
|
|
:range (copy-tree (range cstr))
|
2020-12-23 10:48:29 +01:00
|
|
|
|
:neg (neg cstr))))
|
2020-12-05 19:36:00 +01:00
|
|
|
|
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(defsubst comp-cstr-empty-p (cstr)
|
|
|
|
|
"Return t if CSTR is equivalent to the `nil' type specifier or nil otherwise."
|
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(and (null (typeset cstr))
|
|
|
|
|
(null (valset cstr))
|
|
|
|
|
(null (range cstr)))))
|
|
|
|
|
|
2020-12-07 21:33:11 +01:00
|
|
|
|
(defun comp-cstrs-homogeneous (cstrs)
|
|
|
|
|
"Check if constraints CSTRS are all homogeneously negated or non-negated.
|
|
|
|
|
Return `pos' if they are all positive, `neg' if they are all
|
|
|
|
|
negated or nil othewise."
|
|
|
|
|
(cl-loop
|
|
|
|
|
for cstr in cstrs
|
|
|
|
|
unless (comp-cstr-neg cstr)
|
|
|
|
|
count t into n-pos
|
|
|
|
|
else
|
|
|
|
|
count t into n-neg
|
|
|
|
|
finally
|
|
|
|
|
(cond
|
|
|
|
|
((zerop n-neg) (cl-return 'pos))
|
|
|
|
|
((zerop n-pos) (cl-return 'neg)))))
|
|
|
|
|
|
2020-12-10 18:25:51 +01:00
|
|
|
|
(defun comp-split-pos-neg (cstrs)
|
|
|
|
|
"Split constraints CSTRS into non-negated and negated.
|
|
|
|
|
Return them as multiple value."
|
|
|
|
|
(cl-loop
|
|
|
|
|
for cstr in cstrs
|
|
|
|
|
if (comp-cstr-neg cstr)
|
|
|
|
|
collect cstr into negatives
|
|
|
|
|
else
|
|
|
|
|
collect cstr into positives
|
2020-12-16 18:41:18 +01:00
|
|
|
|
finally return (cl-values positives negatives)))
|
2020-12-10 18:25:51 +01:00
|
|
|
|
|
2020-12-12 10:50:32 +00:00
|
|
|
|
|
|
|
|
|
;;; Value handling.
|
|
|
|
|
|
|
|
|
|
(defun comp-normalize-valset (valset)
|
|
|
|
|
"Sort VALSET and return it."
|
|
|
|
|
(cl-sort valset (lambda (x y)
|
|
|
|
|
;; We might want to use `sxhash-eql' for speed but
|
|
|
|
|
;; this is safer to keep tests stable.
|
|
|
|
|
(< (sxhash-equal x)
|
|
|
|
|
(sxhash-equal y)))))
|
|
|
|
|
|
|
|
|
|
(defun comp-union-valsets (&rest valsets)
|
|
|
|
|
"Union values present into VALSETS."
|
|
|
|
|
(comp-normalize-valset (cl-reduce #'cl-union valsets)))
|
|
|
|
|
|
|
|
|
|
(defun comp-intersection-valsets (&rest valsets)
|
|
|
|
|
"Union values present into VALSETS."
|
|
|
|
|
(comp-normalize-valset (cl-reduce #'cl-intersection valsets)))
|
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
;;; Type handling.
|
|
|
|
|
|
2020-12-12 10:50:32 +00:00
|
|
|
|
(defun comp-normalize-typeset (typeset)
|
|
|
|
|
"Sort TYPESET and return it."
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(cl-sort (cl-remove-duplicates typeset)
|
|
|
|
|
(lambda (x y)
|
|
|
|
|
(string-lessp (symbol-name x)
|
|
|
|
|
(symbol-name y)))))
|
2020-12-12 10:50:32 +00:00
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
(defun comp-supertypes (type)
|
|
|
|
|
"Return a list of pairs (supertype . hierarchy-level) for TYPE."
|
|
|
|
|
(cl-loop
|
|
|
|
|
named outer
|
|
|
|
|
with found = nil
|
|
|
|
|
for l in comp--typeof-types
|
|
|
|
|
do (cl-loop
|
|
|
|
|
for x in l
|
|
|
|
|
for i from (length l) downto 0
|
|
|
|
|
when (eq type x)
|
|
|
|
|
do (setf found t)
|
|
|
|
|
when found
|
|
|
|
|
collect `(,x . ,i) into res
|
|
|
|
|
finally (when found
|
|
|
|
|
(cl-return-from outer res)))))
|
|
|
|
|
|
|
|
|
|
(defun comp-common-supertype-2 (type1 type2)
|
|
|
|
|
"Return the first common supertype of TYPE1 TYPE2."
|
|
|
|
|
(when-let ((types (cl-intersection
|
|
|
|
|
(comp-supertypes type1)
|
|
|
|
|
(comp-supertypes type2)
|
|
|
|
|
:key #'car)))
|
|
|
|
|
(car (cl-reduce (lambda (x y)
|
|
|
|
|
(if (> (cdr x) (cdr y)) x y))
|
|
|
|
|
types))))
|
|
|
|
|
|
|
|
|
|
(defun comp-common-supertype (&rest types)
|
|
|
|
|
"Return the first common supertype of TYPES."
|
|
|
|
|
(or (gethash types (comp-cstr-ctxt-common-supertype-mem comp-ctxt))
|
|
|
|
|
(puthash types
|
|
|
|
|
(cl-reduce #'comp-common-supertype-2 types)
|
|
|
|
|
(comp-cstr-ctxt-common-supertype-mem comp-ctxt))))
|
|
|
|
|
|
|
|
|
|
(defsubst comp-subtype-p (type1 type2)
|
|
|
|
|
"Return t if TYPE1 is a subtype of TYPE2 or nil otherwise."
|
|
|
|
|
(eq (comp-common-supertype-2 type1 type2) type2))
|
|
|
|
|
|
|
|
|
|
(defun comp-union-typesets (&rest typesets)
|
|
|
|
|
"Union types present into TYPESETS."
|
|
|
|
|
(or (gethash typesets (comp-cstr-ctxt-union-typesets-mem comp-ctxt))
|
|
|
|
|
(puthash typesets
|
|
|
|
|
(cl-loop
|
|
|
|
|
with types = (apply #'append typesets)
|
|
|
|
|
with res = '()
|
|
|
|
|
for lane in comp--typeof-types
|
|
|
|
|
do (cl-loop
|
|
|
|
|
with last = nil
|
|
|
|
|
for x in lane
|
|
|
|
|
when (memq x types)
|
|
|
|
|
do (setf last x)
|
|
|
|
|
finally (when last
|
|
|
|
|
(push last res)))
|
2020-12-16 18:41:18 +01:00
|
|
|
|
finally return (comp-normalize-typeset res))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
(comp-cstr-ctxt-union-typesets-mem comp-ctxt))))
|
|
|
|
|
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(defun comp-intersect-two-typesets (t1 t2)
|
|
|
|
|
"Intersect typesets T1 and T2."
|
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(cl-loop
|
|
|
|
|
for types in (list t1 t2)
|
|
|
|
|
for other-types in (list t2 t1)
|
|
|
|
|
append
|
|
|
|
|
(cl-loop
|
|
|
|
|
for type in types
|
|
|
|
|
when (cl-some (lambda (x)
|
|
|
|
|
(comp-subtype-p type x))
|
|
|
|
|
other-types)
|
|
|
|
|
collect type))))
|
|
|
|
|
|
2020-11-27 21:30:03 +01:00
|
|
|
|
(defun comp-intersect-typesets (&rest typesets)
|
|
|
|
|
"Intersect types present into TYPESETS."
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(unless (cl-some #'null typesets)
|
|
|
|
|
(if (= (length typesets) 1)
|
|
|
|
|
(car typesets)
|
|
|
|
|
(comp-normalize-typeset
|
|
|
|
|
(cl-reduce #'comp-intersect-two-typesets typesets)))))
|
2020-11-27 21:30:03 +01:00
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
;;; Integer range handling
|
|
|
|
|
|
2020-12-05 17:59:00 +01:00
|
|
|
|
(defsubst comp-star-or-num-p (x)
|
|
|
|
|
(or (numberp x) (eq '* x)))
|
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
(defsubst comp-range-1+ (x)
|
|
|
|
|
(if (symbolp x)
|
|
|
|
|
x
|
|
|
|
|
(1+ x)))
|
|
|
|
|
|
|
|
|
|
(defsubst comp-range-1- (x)
|
|
|
|
|
(if (symbolp x)
|
|
|
|
|
x
|
|
|
|
|
(1- x)))
|
|
|
|
|
|
|
|
|
|
(defsubst comp-range-< (x y)
|
|
|
|
|
(cond
|
|
|
|
|
((eq x '+) nil)
|
|
|
|
|
((eq x '-) t)
|
|
|
|
|
((eq y '+) t)
|
|
|
|
|
((eq y '-) nil)
|
|
|
|
|
(t (< x y))))
|
|
|
|
|
|
|
|
|
|
(defun comp-range-union (&rest ranges)
|
|
|
|
|
"Combine integer intervals RANGES by union set operation."
|
|
|
|
|
(cl-loop
|
|
|
|
|
with all-ranges = (apply #'append ranges)
|
|
|
|
|
with lows = (mapcar (lambda (x)
|
|
|
|
|
(cons (comp-range-1- (car x)) 'l))
|
|
|
|
|
all-ranges)
|
|
|
|
|
with highs = (mapcar (lambda (x)
|
|
|
|
|
(cons (cdr x) 'h))
|
|
|
|
|
all-ranges)
|
|
|
|
|
with nest = 0
|
|
|
|
|
with low = nil
|
|
|
|
|
with res = ()
|
|
|
|
|
for (i . x) in (cl-sort (nconc lows highs) #'comp-range-< :key #'car)
|
|
|
|
|
if (eq x 'l)
|
|
|
|
|
do
|
|
|
|
|
(when (zerop nest)
|
|
|
|
|
(setf low i))
|
|
|
|
|
(cl-incf nest)
|
|
|
|
|
else
|
|
|
|
|
do
|
|
|
|
|
(when (= nest 1)
|
|
|
|
|
(push `(,(comp-range-1+ low) . ,i) res))
|
|
|
|
|
(cl-decf nest)
|
2020-12-16 18:41:18 +01:00
|
|
|
|
finally return (reverse res)))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
(defun comp-range-intersection (&rest ranges)
|
|
|
|
|
"Combine integer intervals RANGES by intersecting."
|
|
|
|
|
(cl-loop
|
|
|
|
|
with all-ranges = (apply #'append ranges)
|
|
|
|
|
with n-ranges = (length ranges)
|
|
|
|
|
with lows = (mapcar (lambda (x)
|
|
|
|
|
(cons (car x) 'l))
|
|
|
|
|
all-ranges)
|
|
|
|
|
with highs = (mapcar (lambda (x)
|
|
|
|
|
(cons (cdr x) 'h))
|
|
|
|
|
all-ranges)
|
|
|
|
|
with nest = 0
|
|
|
|
|
with low = nil
|
|
|
|
|
with res = ()
|
2020-12-08 21:24:14 +01:00
|
|
|
|
for (i . x) in (cl-sort (nconc lows highs) #'comp-range-< :key #'car)
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
initially (when (cl-some #'null ranges)
|
|
|
|
|
;; Intersecting with a null range always results in a
|
|
|
|
|
;; null range.
|
|
|
|
|
(cl-return '()))
|
|
|
|
|
if (eq x 'l)
|
|
|
|
|
do
|
|
|
|
|
(cl-incf nest)
|
|
|
|
|
(when (= nest n-ranges)
|
|
|
|
|
(setf low i))
|
|
|
|
|
else
|
|
|
|
|
do
|
|
|
|
|
(when (= nest n-ranges)
|
|
|
|
|
(push `(,low . ,i)
|
|
|
|
|
res))
|
|
|
|
|
(cl-decf nest)
|
2020-12-16 18:41:18 +01:00
|
|
|
|
finally return (reverse res)))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
2020-12-02 21:44:00 +01:00
|
|
|
|
(defun comp-range-negation (range)
|
|
|
|
|
"Negate range RANGE."
|
2020-12-02 22:47:00 +01:00
|
|
|
|
(if (null range)
|
|
|
|
|
'((- . +))
|
|
|
|
|
(cl-loop
|
|
|
|
|
with res = ()
|
|
|
|
|
with last-h = '-
|
|
|
|
|
for (l . h) in range
|
|
|
|
|
unless (eq l '-)
|
2020-12-02 21:44:00 +01:00
|
|
|
|
do (push `(,(comp-range-1+ last-h) . ,(1- l)) res)
|
2020-12-02 22:47:00 +01:00
|
|
|
|
do (setf last-h h)
|
|
|
|
|
finally
|
|
|
|
|
(unless (eq '+ last-h)
|
|
|
|
|
(push `(,(1+ last-h) . +) res))
|
|
|
|
|
(cl-return (reverse res)))))
|
2020-12-02 21:44:00 +01:00
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
2020-12-02 22:47:00 +01:00
|
|
|
|
;;; Union specific code.
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
2020-12-02 22:47:00 +01:00
|
|
|
|
(defun comp-cstr-union-homogeneous-no-range (dst &rest srcs)
|
|
|
|
|
"As `comp-cstr-union' but escluding the irange component.
|
|
|
|
|
All SRCS constraints must be homogeneously negated or non-negated."
|
2020-12-02 22:45:00 +01:00
|
|
|
|
|
|
|
|
|
;; Type propagation.
|
|
|
|
|
(setf (comp-cstr-typeset dst)
|
|
|
|
|
(apply #'comp-union-typesets (mapcar #'comp-cstr-typeset srcs)))
|
|
|
|
|
|
|
|
|
|
;; Value propagation.
|
|
|
|
|
(setf (comp-cstr-valset dst)
|
2020-12-12 10:50:32 +00:00
|
|
|
|
(comp-normalize-valset
|
|
|
|
|
(cl-loop
|
|
|
|
|
with values = (mapcar #'comp-cstr-valset srcs)
|
|
|
|
|
;; TODO sort.
|
|
|
|
|
for v in (cl-remove-duplicates (apply #'append values)
|
|
|
|
|
:test #'equal)
|
|
|
|
|
;; We propagate only values those types are not already
|
|
|
|
|
;; into typeset.
|
|
|
|
|
when (cl-notany (lambda (x)
|
|
|
|
|
(comp-subtype-p (type-of v) x))
|
|
|
|
|
(comp-cstr-typeset dst))
|
|
|
|
|
collect v)))
|
2020-12-02 22:45:00 +01:00
|
|
|
|
|
|
|
|
|
dst)
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(defun comp-cstr-union-homogeneous (range dst &rest srcs)
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
"Combine SRCS by union set operation setting the result in DST.
|
2020-12-23 14:03:54 +01:00
|
|
|
|
Do range propagation when RANGE is non-nil.
|
2020-12-02 22:47:00 +01:00
|
|
|
|
All SRCS constraints must be homogeneously negated or non-negated.
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
DST is returned."
|
2020-12-02 22:47:00 +01:00
|
|
|
|
(apply #'comp-cstr-union-homogeneous-no-range dst srcs)
|
2020-11-27 21:30:03 +01:00
|
|
|
|
;; Range propagation.
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(setf (comp-cstr-neg dst)
|
|
|
|
|
(when srcs
|
|
|
|
|
(comp-cstr-neg (car srcs)))
|
|
|
|
|
|
|
|
|
|
(comp-cstr-range dst)
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
(when (cl-notany (lambda (x)
|
|
|
|
|
(comp-subtype-p 'integer x))
|
|
|
|
|
(comp-cstr-typeset dst))
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(if range
|
|
|
|
|
(apply #'comp-range-union
|
|
|
|
|
(mapcar #'comp-cstr-range srcs))
|
|
|
|
|
'((- . +)))))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
dst)
|
|
|
|
|
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(cl-defun comp-cstr-union-1-no-mem (range &rest srcs)
|
2020-12-02 22:47:00 +01:00
|
|
|
|
"Combine SRCS by union set operation setting the result in DST.
|
|
|
|
|
Do range propagation when RANGE is non-nil.
|
2020-12-05 19:36:00 +01:00
|
|
|
|
Non memoized version of `comp-cstr-union-1'.
|
2020-12-02 22:47:00 +01:00
|
|
|
|
DST is returned."
|
2020-12-02 23:48:00 +01:00
|
|
|
|
(with-comp-cstr-accessors
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(let ((dst (make-comp-cstr)))
|
|
|
|
|
(cl-flet ((give-up ()
|
|
|
|
|
(setf (typeset dst) '(t)
|
|
|
|
|
(valset dst) ()
|
|
|
|
|
(range dst) ()
|
|
|
|
|
(neg dst) nil)
|
|
|
|
|
(cl-return-from comp-cstr-union-1-no-mem dst)))
|
|
|
|
|
|
|
|
|
|
;; Check first if we are in the simple case of all input non-negate
|
|
|
|
|
;; or negated so we don't have to cons.
|
|
|
|
|
(when-let ((res (comp-cstrs-homogeneous srcs)))
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(apply #'comp-cstr-union-homogeneous range dst srcs)
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(cl-return-from comp-cstr-union-1-no-mem dst))
|
|
|
|
|
|
|
|
|
|
;; Some are negated and some are not
|
|
|
|
|
(cl-multiple-value-bind (positives negatives) (comp-split-pos-neg srcs)
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(let* ((pos (apply #'comp-cstr-union-homogeneous range
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(make-comp-cstr) positives))
|
|
|
|
|
;; We'll always use neg as result as this is almost
|
|
|
|
|
;; always necessary for describing open intervals
|
|
|
|
|
;; resulting from negated constraints.
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(neg (apply #'comp-cstr-union-homogeneous range
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(make-comp-cstr :neg t) negatives)))
|
|
|
|
|
;; Type propagation.
|
|
|
|
|
(when (and (typeset pos)
|
|
|
|
|
;; When every pos type is a subtype of some neg ones.
|
|
|
|
|
(cl-every (lambda (x)
|
|
|
|
|
(cl-some (lambda (y)
|
|
|
|
|
(comp-subtype-p x y))
|
|
|
|
|
(append (typeset neg)
|
|
|
|
|
(when (range neg)
|
|
|
|
|
'(integer)))))
|
|
|
|
|
(typeset pos)))
|
|
|
|
|
;; This is a conservative choice, ATM we can't represent such
|
|
|
|
|
;; a disjoint set of types unless we decide to add a new slot
|
|
|
|
|
;; into `comp-cstr' or adopt something like
|
|
|
|
|
;; `intersection-type' `union-type' in SBCL. Keep it
|
|
|
|
|
;; "simple" for now.
|
|
|
|
|
(give-up))
|
|
|
|
|
|
|
|
|
|
;; Verify disjoint condition between positive types and
|
|
|
|
|
;; negative types coming from values, in case give-up.
|
|
|
|
|
(let ((neg-value-types (nconc (mapcar #'type-of (valset neg))
|
|
|
|
|
(when (range neg)
|
|
|
|
|
'(integer)))))
|
|
|
|
|
(when (cl-some (lambda (x)
|
|
|
|
|
(cl-some (lambda (y)
|
|
|
|
|
(and (not (eq y x))
|
|
|
|
|
(comp-subtype-p y x)))
|
|
|
|
|
neg-value-types))
|
|
|
|
|
(typeset pos))
|
|
|
|
|
(give-up)))
|
|
|
|
|
|
|
|
|
|
;; Value propagation.
|
|
|
|
|
(cond
|
|
|
|
|
((and (valset pos) (valset neg)
|
|
|
|
|
(equal (comp-union-valsets (valset pos) (valset neg))
|
|
|
|
|
(valset pos)))
|
|
|
|
|
;; Pos is a superset of neg.
|
|
|
|
|
(give-up))
|
|
|
|
|
(t
|
|
|
|
|
;; pos is a subset or eq to neg
|
|
|
|
|
(setf (valset neg)
|
|
|
|
|
(cl-nset-difference (valset neg) (valset pos)))))
|
|
|
|
|
|
|
|
|
|
;; Range propagation
|
2020-12-18 17:22:05 +01:00
|
|
|
|
(when range
|
|
|
|
|
;; Handle apart (or (integer 1 1) (not (integer 1 1)))
|
|
|
|
|
;; like cases.
|
|
|
|
|
(if (and (range pos) (range neg)
|
|
|
|
|
(equal (range pos) (range neg)))
|
|
|
|
|
(give-up)
|
|
|
|
|
(setf (range neg)
|
|
|
|
|
(comp-range-negation
|
|
|
|
|
(comp-range-union
|
|
|
|
|
(comp-range-negation (range neg))
|
|
|
|
|
(range pos))))))
|
2020-12-17 22:31:09 +01:00
|
|
|
|
|
|
|
|
|
(if (comp-cstr-empty-p neg)
|
|
|
|
|
(setf (typeset dst) (typeset pos)
|
|
|
|
|
(valset dst) (valset pos)
|
|
|
|
|
(range dst) (range pos)
|
2020-12-06 18:01:28 +01:00
|
|
|
|
(neg dst) nil)
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(setf (typeset dst) (typeset neg)
|
|
|
|
|
(valset dst) (valset neg)
|
|
|
|
|
(range dst) (range neg)
|
|
|
|
|
(neg dst) (neg neg))))))
|
|
|
|
|
dst)))
|
2020-12-02 22:47:00 +01:00
|
|
|
|
|
2020-12-05 19:36:00 +01:00
|
|
|
|
(defun comp-cstr-union-1 (range dst &rest srcs)
|
|
|
|
|
"Combine SRCS by union set operation setting the result in DST.
|
|
|
|
|
Do range propagation when RANGE is non-nil.
|
|
|
|
|
DST is returned."
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(let* ((mem-h (if range
|
|
|
|
|
(comp-cstr-ctxt-union-1-mem-range comp-ctxt)
|
|
|
|
|
(comp-cstr-ctxt-union-1-mem-no-range comp-ctxt)))
|
|
|
|
|
(res (or (gethash srcs mem-h)
|
|
|
|
|
(puthash
|
2020-12-23 10:46:33 +01:00
|
|
|
|
(mapcar #'comp-cstr-copy srcs)
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(apply #'comp-cstr-union-1-no-mem range srcs)
|
|
|
|
|
mem-h))))
|
|
|
|
|
(setf (typeset dst) (typeset res)
|
|
|
|
|
(valset dst) (valset res)
|
|
|
|
|
(range dst) (range res)
|
|
|
|
|
(neg dst) (neg res))
|
|
|
|
|
res)))
|
2020-12-05 19:36:00 +01:00
|
|
|
|
|
2020-12-08 21:24:14 +01:00
|
|
|
|
(cl-defun comp-cstr-intersection-homogeneous (dst &rest srcs)
|
2020-11-27 21:30:03 +01:00
|
|
|
|
"Combine SRCS by intersection set operation setting the result in DST.
|
2020-12-08 21:24:14 +01:00
|
|
|
|
All SRCS constraints must be homogeneously negated or non-negated.
|
2020-11-27 21:30:03 +01:00
|
|
|
|
DST is returned."
|
|
|
|
|
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(when (cl-some #'comp-cstr-empty-p srcs)
|
|
|
|
|
(setf (valset dst) nil
|
|
|
|
|
(range dst) nil
|
|
|
|
|
(typeset dst) nil)
|
|
|
|
|
(cl-return-from comp-cstr-intersection-homogeneous dst))
|
2020-11-27 21:30:03 +01:00
|
|
|
|
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(setf (neg dst) (when srcs
|
|
|
|
|
(neg (car srcs))))
|
2020-11-27 21:30:03 +01:00
|
|
|
|
|
2020-12-16 18:41:18 +01:00
|
|
|
|
;; Type propagation.
|
|
|
|
|
(setf (typeset dst)
|
2020-11-27 21:30:03 +01:00
|
|
|
|
(apply #'comp-intersect-typesets
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(mapcar #'comp-cstr-typeset srcs)))
|
|
|
|
|
|
|
|
|
|
;; Value propagation.
|
|
|
|
|
(setf (valset dst)
|
|
|
|
|
(comp-normalize-valset
|
|
|
|
|
(cl-loop
|
|
|
|
|
for src in srcs
|
|
|
|
|
append
|
|
|
|
|
(cl-loop
|
|
|
|
|
for val in (valset src)
|
|
|
|
|
;; If (member value) is subtypep of all other sources then
|
|
|
|
|
;; is good to be colleted.
|
|
|
|
|
when (cl-every (lambda (s)
|
|
|
|
|
(or (memq val (valset s))
|
|
|
|
|
(cl-some (lambda (type)
|
|
|
|
|
(cl-typep val type))
|
|
|
|
|
(typeset s))))
|
|
|
|
|
(remq src srcs))
|
|
|
|
|
collect val))))
|
|
|
|
|
|
|
|
|
|
;; Range propagation.
|
|
|
|
|
(setf (range dst)
|
|
|
|
|
;; Do range propagation only if the destination typeset
|
|
|
|
|
;; doesn't cover it already.
|
|
|
|
|
(unless (cl-some (lambda (type)
|
|
|
|
|
(comp-subtype-p 'integer type))
|
|
|
|
|
(typeset dst))
|
|
|
|
|
(apply #'comp-range-intersection
|
|
|
|
|
(cl-loop
|
|
|
|
|
for src in srcs
|
|
|
|
|
;; Collect effective ranges.
|
|
|
|
|
collect (or (range src)
|
|
|
|
|
(when (cl-some (lambda (s)
|
|
|
|
|
(comp-subtype-p 'integer s))
|
|
|
|
|
(typeset src))
|
|
|
|
|
'((- . +))))))))
|
|
|
|
|
|
|
|
|
|
dst))
|
2020-12-08 21:24:14 +01:00
|
|
|
|
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(cl-defun comp-cstr-intersection-no-mem (&rest srcs)
|
|
|
|
|
"Combine SRCS by intersection set operation.
|
|
|
|
|
Non memoized version of `comp-cstr-intersection-no-mem'."
|
|
|
|
|
(let ((dst (make-comp-cstr)))
|
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(cl-flet ((return-empty ()
|
|
|
|
|
(setf (typeset dst) ()
|
|
|
|
|
(valset dst) ()
|
|
|
|
|
(range dst) ()
|
|
|
|
|
(neg dst) nil)
|
|
|
|
|
(cl-return-from comp-cstr-intersection-no-mem dst)))
|
|
|
|
|
(when-let ((res (comp-cstrs-homogeneous srcs)))
|
|
|
|
|
(if (eq res 'neg)
|
2020-12-23 14:03:54 +01:00
|
|
|
|
(apply #'comp-cstr-union-homogeneous t dst srcs)
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(apply #'comp-cstr-intersection-homogeneous dst srcs))
|
|
|
|
|
(cl-return-from comp-cstr-intersection-no-mem dst))
|
|
|
|
|
|
|
|
|
|
;; Some are negated and some are not
|
|
|
|
|
(cl-multiple-value-bind (positives negatives) (comp-split-pos-neg srcs)
|
|
|
|
|
(let* ((pos (apply #'comp-cstr-intersection-homogeneous
|
|
|
|
|
(make-comp-cstr) positives))
|
|
|
|
|
(neg (apply #'comp-cstr-intersection-homogeneous
|
|
|
|
|
(make-comp-cstr) negatives)))
|
|
|
|
|
|
|
|
|
|
;; In case pos is not relevant return directly the content
|
|
|
|
|
;; of neg.
|
|
|
|
|
(when (equal (typeset pos) '(t))
|
|
|
|
|
(setf (typeset dst) (typeset neg)
|
|
|
|
|
(valset dst) (valset neg)
|
|
|
|
|
(range dst) (range neg)
|
|
|
|
|
(neg dst) t)
|
|
|
|
|
|
|
|
|
|
;; (not t) => nil
|
|
|
|
|
(when (and (null (valset dst))
|
|
|
|
|
(null (range dst))
|
|
|
|
|
(neg dst)
|
|
|
|
|
(equal '(t) (typeset dst)))
|
2020-12-08 21:24:14 +01:00
|
|
|
|
(setf (typeset dst) ()
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(neg dst) nil))
|
|
|
|
|
|
|
|
|
|
(cl-return-from comp-cstr-intersection-no-mem dst))
|
|
|
|
|
|
|
|
|
|
(when (cl-some
|
|
|
|
|
(lambda (ty)
|
|
|
|
|
(memq ty (typeset neg)))
|
|
|
|
|
(typeset pos))
|
|
|
|
|
(return-empty))
|
|
|
|
|
|
|
|
|
|
;; Some negated types are subtypes of some non-negated one.
|
|
|
|
|
;; Transform the corresponding set of types from neg to pos.
|
|
|
|
|
(cl-loop
|
|
|
|
|
for neg-type in (typeset neg)
|
|
|
|
|
do (cl-loop
|
|
|
|
|
for pos-type in (copy-sequence (typeset pos))
|
|
|
|
|
when (and (not (eq neg-type pos-type))
|
|
|
|
|
(comp-subtype-p neg-type pos-type))
|
|
|
|
|
do (cl-loop
|
|
|
|
|
with found
|
|
|
|
|
for (type . _) in (comp-supertypes neg-type)
|
|
|
|
|
when found
|
|
|
|
|
collect type into res
|
|
|
|
|
when (eq type pos-type)
|
|
|
|
|
do (setf (typeset pos) (cl-union (typeset pos) res))
|
|
|
|
|
(cl-return)
|
|
|
|
|
when (eq type neg-type)
|
|
|
|
|
do (setf found t))))
|
|
|
|
|
|
|
|
|
|
(setf (range pos)
|
|
|
|
|
(comp-range-intersection (range pos)
|
|
|
|
|
(comp-range-negation (range neg))))
|
|
|
|
|
|
|
|
|
|
;; Return a non negated form.
|
|
|
|
|
(setf (typeset dst) (typeset pos)
|
|
|
|
|
(valset dst) (valset pos)
|
|
|
|
|
(range dst) (range pos)
|
|
|
|
|
(neg dst) nil)))
|
|
|
|
|
dst))))
|
2020-12-12 20:43:04 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Entry points.
|
|
|
|
|
|
|
|
|
|
(defun comp-cstr-union-no-range (dst &rest srcs)
|
|
|
|
|
"Combine SRCS by union set operation setting the result in DST.
|
|
|
|
|
Do not propagate the range component.
|
|
|
|
|
DST is returned."
|
|
|
|
|
(apply #'comp-cstr-union-1 nil dst srcs))
|
|
|
|
|
|
|
|
|
|
(defun comp-cstr-union (dst &rest srcs)
|
|
|
|
|
"Combine SRCS by union set operation setting the result in DST.
|
|
|
|
|
DST is returned."
|
|
|
|
|
(apply #'comp-cstr-union-1 t dst srcs))
|
|
|
|
|
|
|
|
|
|
(defun comp-cstr-union-make (&rest srcs)
|
|
|
|
|
"Combine SRCS by union set operation and return a new constraint."
|
|
|
|
|
(apply #'comp-cstr-union (make-comp-cstr) srcs))
|
|
|
|
|
|
|
|
|
|
(defun comp-cstr-intersection (dst &rest srcs)
|
|
|
|
|
"Combine SRCS by intersection set operation setting the result in DST.
|
|
|
|
|
DST is returned."
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(let* ((mem-h (comp-cstr-ctxt-intersection-mem comp-ctxt))
|
|
|
|
|
(res (or (gethash srcs mem-h)
|
|
|
|
|
(puthash
|
2020-12-23 10:46:33 +01:00
|
|
|
|
(mapcar #'comp-cstr-copy srcs)
|
2020-12-17 22:31:09 +01:00
|
|
|
|
(apply #'comp-cstr-intersection-no-mem srcs)
|
|
|
|
|
mem-h))))
|
|
|
|
|
(setf (typeset dst) (typeset res)
|
|
|
|
|
(valset dst) (valset res)
|
|
|
|
|
(range dst) (range res)
|
|
|
|
|
(neg dst) (neg res))
|
|
|
|
|
res)))
|
2020-11-27 21:30:03 +01:00
|
|
|
|
|
|
|
|
|
(defun comp-cstr-intersection-make (&rest srcs)
|
|
|
|
|
"Combine SRCS by intersection set operation and return a new constraint."
|
|
|
|
|
(apply #'comp-cstr-intersection (make-comp-cstr) srcs))
|
|
|
|
|
|
2020-12-02 21:44:00 +01:00
|
|
|
|
(defun comp-cstr-negation (dst src)
|
|
|
|
|
"Negate SRC setting the result in DST.
|
|
|
|
|
DST is returned."
|
2020-12-16 18:41:18 +01:00
|
|
|
|
(with-comp-cstr-accessors
|
|
|
|
|
(setf (typeset dst) (typeset src)
|
|
|
|
|
(valset dst) (valset src)
|
|
|
|
|
(range dst) (range src)
|
|
|
|
|
(neg dst) (not (neg src)))
|
|
|
|
|
dst))
|
2020-12-02 21:44:00 +01:00
|
|
|
|
|
|
|
|
|
(defun comp-cstr-negation-make (src)
|
|
|
|
|
"Negate SRC and return a new constraint."
|
|
|
|
|
(comp-cstr-negation (make-comp-cstr) src))
|
|
|
|
|
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
(defun comp-type-spec-to-cstr (type-spec &optional fn)
|
|
|
|
|
"Convert a type specifier TYPE-SPEC into a `comp-cstr'.
|
|
|
|
|
FN non-nil indicates we are parsing a function lambda list."
|
2020-12-05 17:59:00 +01:00
|
|
|
|
(pcase type-spec
|
|
|
|
|
((and (or '&optional '&rest) x)
|
|
|
|
|
(if fn
|
|
|
|
|
x
|
|
|
|
|
(error "Invalid `%s` in type specifier" x)))
|
2020-12-16 18:41:18 +01:00
|
|
|
|
('nil
|
|
|
|
|
(make-comp-cstr :typeset ()))
|
2020-12-05 17:59:00 +01:00
|
|
|
|
('fixnum
|
|
|
|
|
(comp-irange-to-cstr `(,most-negative-fixnum . ,most-positive-fixnum)))
|
|
|
|
|
('boolean
|
|
|
|
|
(comp-type-spec-to-cstr '(member t nil)))
|
2020-12-16 18:41:18 +01:00
|
|
|
|
('integer
|
|
|
|
|
(comp-irange-to-cstr '(- . +)))
|
2020-12-05 17:59:00 +01:00
|
|
|
|
('null (comp-value-to-cstr nil))
|
|
|
|
|
((pred atom)
|
|
|
|
|
(comp-type-to-cstr type-spec))
|
|
|
|
|
(`(or . ,rest)
|
|
|
|
|
(apply #'comp-cstr-union-make
|
|
|
|
|
(mapcar #'comp-type-spec-to-cstr rest)))
|
|
|
|
|
(`(and . ,rest)
|
|
|
|
|
(apply #'comp-cstr-intersection-make
|
|
|
|
|
(mapcar #'comp-type-spec-to-cstr rest)))
|
|
|
|
|
(`(not ,cstr)
|
|
|
|
|
(comp-cstr-negation-make (comp-type-spec-to-cstr cstr)))
|
|
|
|
|
(`(integer ,(and (pred integerp) l) ,(and (pred integerp) h))
|
|
|
|
|
(comp-irange-to-cstr `(,l . ,h)))
|
|
|
|
|
(`(integer * ,(and (pred integerp) h))
|
|
|
|
|
(comp-irange-to-cstr `(- . ,h)))
|
|
|
|
|
(`(integer ,(and (pred integerp) l) *)
|
|
|
|
|
(comp-irange-to-cstr `(,l . +)))
|
|
|
|
|
(`(float ,(pred comp-star-or-num-p) ,(pred comp-star-or-num-p))
|
|
|
|
|
;; No float range support :/
|
|
|
|
|
(comp-type-to-cstr 'float))
|
|
|
|
|
(`(member . ,rest)
|
|
|
|
|
(apply #'comp-cstr-union-make (mapcar #'comp-value-to-cstr rest)))
|
|
|
|
|
(`(function ,args ,ret)
|
|
|
|
|
(make-comp-cstr-f
|
|
|
|
|
:args (mapcar (lambda (x)
|
|
|
|
|
(comp-type-spec-to-cstr x t))
|
|
|
|
|
args)
|
|
|
|
|
:ret (comp-type-spec-to-cstr ret)))
|
|
|
|
|
(_ (error "Invalid type specifier"))))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
(defun comp-cstr-to-type-spec (cstr)
|
|
|
|
|
"Given CSTR return its type specifier."
|
|
|
|
|
(let ((valset (comp-cstr-valset cstr))
|
|
|
|
|
(typeset (comp-cstr-typeset cstr))
|
2020-12-02 21:44:00 +01:00
|
|
|
|
(range (comp-cstr-range cstr))
|
|
|
|
|
(negated (comp-cstr-neg cstr)))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
(when valset
|
|
|
|
|
(when (memq nil valset)
|
|
|
|
|
(if (memq t valset)
|
|
|
|
|
(progn
|
|
|
|
|
;; t and nil are values, convert into `boolean'.
|
|
|
|
|
(push 'boolean typeset)
|
|
|
|
|
(setf valset (remove t (remove nil valset))))
|
|
|
|
|
;; Only nil is a value, convert it into a `null' type specifier.
|
|
|
|
|
(setf valset (remove nil valset))
|
|
|
|
|
(push 'null typeset))))
|
|
|
|
|
|
|
|
|
|
;; Form proper integer type specifiers.
|
|
|
|
|
(setf range (cl-loop for (l . h) in range
|
|
|
|
|
for low = (if (integerp l) l '*)
|
|
|
|
|
for high = (if (integerp h) h '*)
|
2020-12-16 18:41:18 +01:00
|
|
|
|
if (and (eq low '*) (eq high '*))
|
|
|
|
|
collect 'integer
|
|
|
|
|
else
|
|
|
|
|
collect `(integer ,low , high))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
valset (cl-remove-duplicates valset))
|
|
|
|
|
|
|
|
|
|
;; Form the final type specifier.
|
|
|
|
|
(let* ((types-ints (append typeset range))
|
|
|
|
|
(res (cond
|
|
|
|
|
((and types-ints valset)
|
|
|
|
|
`((member ,@valset) ,@types-ints))
|
|
|
|
|
(types-ints types-ints)
|
|
|
|
|
(valset `(member ,@valset))
|
|
|
|
|
(t
|
|
|
|
|
;; Empty type specifier
|
2020-12-02 21:44:00 +01:00
|
|
|
|
nil)))
|
|
|
|
|
(final
|
|
|
|
|
(pcase res
|
2020-12-05 17:59:00 +01:00
|
|
|
|
((or `(member . ,rest)
|
|
|
|
|
`(integer ,(pred comp-star-or-num-p)
|
|
|
|
|
,(pred comp-star-or-num-p)))
|
2020-12-02 21:44:00 +01:00
|
|
|
|
(if rest
|
|
|
|
|
res
|
|
|
|
|
(car res)))
|
|
|
|
|
((pred atom) res)
|
|
|
|
|
(`(,_first . ,rest)
|
|
|
|
|
(if rest
|
|
|
|
|
`(or ,@res)
|
|
|
|
|
(car res))))))
|
|
|
|
|
(if negated
|
|
|
|
|
`(not ,final)
|
|
|
|
|
final))))
|
Add comp-cstr.el and comp-cstr-tests.el
As the constraint logic of the compiler is not trivial and largely
independent from the rest of the code move it into comp-cstr.el to
ease separation and maintainability.
This commit improve the conversion type
specifier -> constraint for generality.
Lastly this should help with bootstrap time as comp.el compilation
unit is slimmed down.
* lisp/emacs-lisp/comp-cstr.el: New file.
(comp--typeof-types, comp--all-builtin-types): Move from comp.el.
(comp-cstr, comp-cstr-f): Same + rename.
(comp-cstr-ctxt): New struct.
(comp-supertypes, comp-common-supertype-2)
(comp-common-supertype, comp-subtype-p, comp-union-typesets)
(comp-range-1+, comp-range-1-, comp-range-<, comp-range-union)
(comp-range-intersection): Move from comp.el.
(comp-cstr-union-no-range, comp-cstr-union): Move from comp.el and
rename.
(comp-cstr-union-make): New function.
(comp-type-spec-to-cstr, comp-cstr-to-type-spec): Move from
comp.el, rename it and rework it.
* lisp/emacs-lisp/comp.el (comp-known-func-cstr-h): Rework.
(comp-ctxt): Remove two fields and include `comp-cstr-ctxt'.
(comp-mvar, comp-fwprop-call): Update for `comp-cstr' being
renamed.
(comp-fwprop-insn): Use `comp-cstr-union-no-range' or
`comp-cstr-union'.
(comp-ret-type-spec): Use `comp-cstr-union' and rework.
* test/lisp/emacs-lisp/comp-cstr-tests.el: New file.
(comp-cstr-test-ts, comp-cstr-typespec-test): New functions.
(comp-cstr-typespec-tests-alist): New defconst to generate tests
on.
(comp-cstr-generate-tests): New macro.
* test/src/comp-tests.el (comp-tests-type-spec-tests): Update.
(ret-type-spec): Initialize constraint context.
2020-11-23 23:51:17 +01:00
|
|
|
|
|
|
|
|
|
(provide 'comp-cstr)
|
|
|
|
|
|
|
|
|
|
;;; comp-cstr.el ends here
|