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-tests.el --- unit tests for src/comp.c -*- lexical-binding: t; -*-
|
|
|
|
|
|
|
|
;; Copyright (C) 2020 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
;; Author: Andrea Corallo <akrl@sdf.org>
|
|
|
|
|
|
|
|
;; 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:
|
|
|
|
|
|
|
|
;; Unit tests for lisp/emacs-lisp/comp-cstr.el
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'ert)
|
|
|
|
(require 'cl-lib)
|
|
|
|
(require 'comp-cstr)
|
|
|
|
|
|
|
|
(defun comp-cstr-test-ts (type-spec)
|
|
|
|
"Create a constraint from TYPE-SPEC and convert it back to type specifier."
|
|
|
|
(let ((comp-ctxt (make-comp-cstr-ctxt)))
|
|
|
|
(comp-cstr-to-type-spec (comp-type-spec-to-cstr type-spec))))
|
|
|
|
|
|
|
|
(defun comp-cstr-typespec-test (number type-spec expected-type-spec)
|
|
|
|
`(ert-deftest ,(intern (concat "comp-cstr-test-" (int-to-string number))) ()
|
|
|
|
(should (equal (comp-cstr-test-ts ',type-spec)
|
|
|
|
',expected-type-spec))))
|
|
|
|
|
|
|
|
(defconst comp-cstr-typespec-tests-alist
|
|
|
|
`((symbol . symbol)
|
|
|
|
((or string array) . array)
|
|
|
|
((or symbol number) . (or symbol number))
|
|
|
|
((or cons atom) . (or cons atom)) ;; SBCL return T
|
2020-11-25 22:41:39 +01:00
|
|
|
((or integer number) . number)
|
|
|
|
((or (or integer symbol) number) . (or symbol number))
|
|
|
|
((or (or integer symbol) (or number list)) . (or list symbol number))
|
|
|
|
((or (or integer number) nil) . number)
|
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
|
|
|
((member foo) . (member foo))
|
|
|
|
((member foo bar) . (member foo bar))
|
|
|
|
((or (member foo) (member bar)) . (member foo bar))
|
|
|
|
((or (member foo) symbol) . symbol) ;; SBCL return (OR SYMBOL (MEMBER FOO))
|
2020-11-25 22:41:39 +01:00
|
|
|
((or (member foo) number) . (or (member foo) number))
|
2020-11-27 21:30:03 +01:00
|
|
|
((or (integer 1 3) number) . number)
|
|
|
|
(integer . integer)
|
2020-11-25 22:41:39 +01:00
|
|
|
((integer 1 2) . (integer 1 2))
|
|
|
|
((or (integer -1 0) (integer 3 4)) . (or (integer -1 0) (integer 3 4)))
|
|
|
|
((or (integer -1 2) (integer 3 4)) . (integer -1 4))
|
|
|
|
((or (integer -1 3) (integer 3 4)) . (integer -1 4))
|
|
|
|
((or (integer -1 4) (integer 3 4)) . (integer -1 4))
|
|
|
|
((or (integer -1 5) (integer 3 4)) . (integer -1 5))
|
|
|
|
((or (integer -1 *) (integer 3 4)) . (integer -1 *))
|
2020-11-27 21:30:03 +01:00
|
|
|
((or (integer -1 2) (integer * 4)) . (integer * 4))
|
|
|
|
((and string array) . string)
|
|
|
|
((and cons atom) . nil)
|
|
|
|
((and (member foo) (member foo bar baz)) . (member foo))
|
|
|
|
((and (member foo) (member bar)) . nil)
|
|
|
|
((and (member foo) symbol) . (member foo))
|
|
|
|
((and (member foo) string) . nil)
|
|
|
|
((and (member foo) (integer 1 2)) . nil)
|
|
|
|
((and (member 1 2) (member 3 2)) . (member 2))
|
|
|
|
((and number (integer 1 2)) . number)
|
|
|
|
((and integer (integer 1 2)) . integer)
|
|
|
|
((and (integer -1 0) (integer 3 5)) . nil)
|
|
|
|
((and (integer -1 2) (integer 3 5)) . nil)
|
|
|
|
((and (integer -1 3) (integer 3 5)) . (integer 3 3))
|
|
|
|
((and (integer -1 4) (integer 3 5)) . (integer 3 4))
|
2020-12-02 21:44:00 +01:00
|
|
|
((and (integer -1 5) nil) . nil)
|
2020-12-02 22:47:00 +01:00
|
|
|
((not symbol) . (not symbol))
|
|
|
|
((or (member foo) (not (member foo bar))) . (not (member bar)))
|
|
|
|
((or (member foo bar) (not (member foo))) . t)
|
2020-12-05 23:42:25 +01:00
|
|
|
;; Intentionally conservative, see `comp-cstr-union-1-no-mem'.
|
2020-12-02 22:47:00 +01:00
|
|
|
((or symbol (not sequence)) . t)
|
2020-12-02 23:51:19 +01:00
|
|
|
((or symbol (not symbol)) . t)
|
|
|
|
;; Conservative.
|
|
|
|
((or symbol (not sequence)) . t)
|
2020-12-02 22:47:00 +01:00
|
|
|
((or vector (not sequence)) . (not sequence))
|
|
|
|
((or (integer 1 10) (not (integer * 5))) . (integer 1 *))
|
2020-12-02 23:51:19 +01:00
|
|
|
((or symbol (integer 1 10) (not (integer * 5))) . (or symbol (integer 1 *)))
|
|
|
|
((or (not symbol) (integer 1 10) (not (integer * 5))) . (not (or symbol (integer * 0))))
|
2020-12-02 23:49:00 +01:00
|
|
|
((or symbol (not (member foo))) . (not (member foo)))
|
2020-12-02 23:51:19 +01:00
|
|
|
((or (not symbol) (not (member foo))) . (not symbol))
|
|
|
|
;; Conservative.
|
|
|
|
((or (not (member foo)) string) . (not (member foo)))
|
|
|
|
;; Conservative.
|
|
|
|
((or (member foo) (not string)) . (not string))
|
|
|
|
((or (not (integer 1 2)) integer) . integer)
|
|
|
|
((or (not (integer 1 2)) (not integer)) . (not integer))
|
2020-12-05 23:42:25 +01:00
|
|
|
((or (integer 1 2) (not integer)) . (not (or integer (integer * 0) (integer 3 *))))
|
|
|
|
((or number (not (integer 1 2))) . t)
|
|
|
|
((or atom (not (integer 1 2))) . t)
|
|
|
|
((or atom (not (member foo))) . t))
|
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
|
|
|
"Alist type specifier -> expected type specifier.")
|
|
|
|
|
|
|
|
(defmacro comp-cstr-synthesize-tests ()
|
|
|
|
"Generate all tests from `comp-cstr-typespec-tests-alist'."
|
|
|
|
`(progn
|
|
|
|
,@(cl-loop
|
|
|
|
for i from 0
|
|
|
|
for (ts . exp-ts) in comp-cstr-typespec-tests-alist
|
|
|
|
append (list (comp-cstr-typespec-test i ts exp-ts)))))
|
|
|
|
|
|
|
|
(comp-cstr-synthesize-tests)
|
|
|
|
|
|
|
|
;;; comp-cstr-tests.el ends here
|