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

Character #462

Merged
merged 9 commits into from
Sep 17, 2023
Merged

Character #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3238345
Add `UnicodeData.txt`
yamacir-kit Sep 14, 2023
9a261ac
Update `digit-value` to account for characters in the non-ASCII range
yamacir-kit Sep 16, 2023
8a6e894
Add struct `character::property_code`
yamacir-kit Sep 16, 2023
6252f2e
Move header `digit_value.hpp` from directory `kernel` to `unicode`
yamacir-kit Sep 16, 2023
6c6d914
Cleanup script `unicode.sh`
yamacir-kit Sep 16, 2023
c31e513
Add new member function `character::upcase`
yamacir-kit Sep 17, 2023
7c76e38
Add new member function `character::downcase`
yamacir-kit Sep 17, 2023
d2ecdb2
Update member function `character::digit_value` to be constexpr
yamacir-kit Sep 17, 2023
eaafa85
Move `char->integer` into `(meevax character)` from `(meevax number)`
yamacir-kit Sep 17, 2023
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
build
include/meevax/unicode
src/kernel/basis.cpp
src/kernel/version.cpp
23 changes: 15 additions & 8 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,29 @@ else()
set(${PROJECT_NAME}_BYTE_ORDER "little-endian")
endif()

execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/script/unicode.sh --digit-value OUTPUT_VARIABLE ${PROJECT_NAME}_UNICODE_DIGIT_VALUE)
execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/script/unicode.sh --downcase OUTPUT_VARIABLE ${PROJECT_NAME}_UNICODE_DOWNCASE)
execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/script/unicode.sh --property OUTPUT_VARIABLE ${PROJECT_NAME}_UNICODE_PROPERTY)
execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/script/unicode.sh --upcase OUTPUT_VARIABLE ${PROJECT_NAME}_UNICODE_UPCASE)

file(GLOB ${PROJECT_NAME}_BASIS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/basis/*.ss)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure/help.txt ${PROJECT_NAME}_HELP_UNCONFIGURED)
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}/unicode/digit_value.hpp "${${PROJECT_NAME}_UNICODE_DIGIT_VALUE}")
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}/unicode/downcase.hpp "${${PROJECT_NAME}_UNICODE_DOWNCASE}")
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}/unicode/property.hpp "${${PROJECT_NAME}_UNICODE_PROPERTY}")
file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/${PROJECT_NAME}/unicode/upcase.hpp "${${PROJECT_NAME}_UNICODE_UPCASE}")

string(CONFIGURE ${${PROJECT_NAME}_HELP_UNCONFIGURED} ${PROJECT_NAME}_HELP)

string(TOLOWER ${CMAKE_SYSTEM_NAME} ${PROJECT_NAME}_SYSTEM_NAME)

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/version.cpp)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md)

file(GLOB ${PROJECT_NAME}_BASIS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/basis/*.ss)

foreach(EACH IN LISTS ${PROJECT_NAME}_BASIS_SOURCES)
get_filename_component(FILENAME ${EACH} NAME)
file(READ ${EACH} ${PROJECT_NAME}_BASIS_${FILENAME})
endforeach()

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/basis.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/basis.cpp)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/README.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/basis.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/basis.cpp)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/version.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/kernel/version.cpp)

# ---- Target kernel -----------------------------------------------------------

Expand All @@ -73,7 +79,8 @@ add_library(${PROJECT_NAME}::kernel ALIAS kernel)

file(GLOB_RECURSE ${PROJECT_NAME}_KERNEL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*/*.cpp)

target_sources(kernel PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES})
target_sources(kernel PRIVATE ${${PROJECT_NAME}_KERNEL_SOURCES}
PRIVATE ${${PROJECT_NAME}_OBJECTS})

target_include_directories(kernel PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Subset of R7RS-small.
cmake -B build -DCMAKE_BUILD_TYPE=Release
cd build
make package
sudo apt install build/meevax_0.4.795_amd64.deb
sudo apt install build/meevax_0.4.804_amd64.deb
```

or
Expand Down Expand Up @@ -106,15 +106,15 @@ sudo rm -rf /usr/local/share/meevax

| Target Name | Description
|-------------|-------------
| `all` | Build shared-library `libmeevax.0.4.795.so` and executable `meevax`
| `all` | Build shared-library `libmeevax.0.4.804.so` and executable `meevax`
| `test` | Test executable `meevax`
| `package` | Generate debian package `meevax_0.4.795_amd64.deb`
| `package` | Generate debian package `meevax_0.4.804_amd64.deb`
| `install` | Copy files into `/usr/local` directly

## Usage

```
Meevax Lisp 0.4.795
Meevax Lisp 0.4.804

Usage:
meevax [option...] [file...]
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.795
0.4.804
34 changes: 0 additions & 34 deletions basis/r4rs-essential.ss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,40 +389,6 @@
(define (char-ci>=? x . xs)
(char-ci-compare x xs >=))

(define (char-alphabetic? x)
(<= (char->integer #\a)
(char->integer (char-downcase x))
(char->integer #\z)))

(define (char-numeric? x)
(<= (char->integer #\0)
(char->integer x)
(char->integer #\9)))

(define (char-whitespace? x)
(or (eqv? x #\space)
(eqv? x #\tab)
(eqv? x #\newline)
(eqv? x #\return)))

(define (char-upper-case? x)
(<= (char->integer #\A)
(char->integer x)
(char->integer #\Z)))

(define (char-lower-case? x)
(<= (char->integer #\a)
(char->integer x)
(char->integer #\z)))

(define (char-downcase c)
(if (char-lower-case? c) c
(integer->char (+ (char->integer c) 32))))

(define (char-upcase c)
(if (char-upper-case? c) c
(integer->char (- (char->integer c) 32))))

(define (string . xs)
(list->string xs))

Expand Down
Loading