Skip to content

Commit

Permalink
[interp] Fix errornous type assertions (#49)
Browse files Browse the repository at this point in the history
* Fix errornous type assertions

* Update runner image

* Update main.yml

* Explicitly install libxt-dev and texlive
  • Loading branch information
GabrielDosReis authored Jul 9, 2024
1 parent d7fe9b5 commit f5abb60
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ ubuntu-latest ]
cxx: [ g++-13 ]
os: [ ubuntu-24.04 ]
cxx: [ g++-14 ]
lisp: [ sbcl ]

steps:
- uses: actions/checkout@v2

- name: Install Lisp and C++ compilers
if: matrix.os == 'ubuntu-latest'
run: |
sudo apt-get update && sudo apt upgrade -y
sudo apt-get install build-essential ${{ matrix.cxx }} ${{ matrix.lisp }} libxpm-dev
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 --slave /usr/bin/g++ g++ /usr/bin/g++-13 --slave /usr/bin/gcov gcov /usr/bin/gcov-13
sudo apt-get install build-essential ${{ matrix.cxx }} ${{ matrix.lisp }} libxt-dev libxpm-dev texlive
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 --slave /usr/bin/g++ g++ /usr/bin/g++-14 --slave /usr/bin/gcov gcov /usr/bin/gcov-14
- name: Configure & Build & Test
run: |
Expand Down
2 changes: 1 addition & 1 deletion src/interp/category.boot
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ descendant?(a,b,tbl,e) ==
b is ["ATTRIBUTE",b'] =>
(l := assoc(b',categoryAttributes a)) => TruthP second l
listMember?(b,categoryPrincipals a) => true
ancestor?(b,[first u for u in categoryAncestors a],tbl,e)
bool ancestor?(b,[first u for u in categoryAncestors a],tbl,e)
--% The implementation of Join
Expand Down
2 changes: 1 addition & 1 deletion src/interp/database.boot
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ niladicConstructor? ctor ==
form := getConstructorFormFromDB ctor => form.args = nil
false
constructorHasCategoryFromDB: %Pair(%Thing,%Thing) -> %List %Code
constructorHasCategoryFromDB: %Pair(%Thing,%Thing) -> %Code
constructorHasCategoryFromDB p ==
GETDATABASE(p,"HASCATEGORY")
Expand Down

0 comments on commit f5abb60

Please sign in to comment.