Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kuroko: more upstream updates

Browse Source
This commit is contained in:
K. Lange 2021-01-23 20:00:36 +09:00
parent ec08e125ec
commit 6a5991fcf5
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -60,8 +60,8 @@ LIBS_Y=$(foreach lib,$(LIBS),.make/$(lib).lmak)
SOURCE_FILES = $(wildcard kernel/*.c kernel/*/*.c kernel/*/*/*.c modules/*.c) SOURCE_FILES = $(wildcard kernel/*.c kernel/*/*.c kernel/*/*/*.c modules/*.c)
SOURCE_FILES += $(wildcard apps/*.c linker/*.c libc/*.c libc/*/*.c lib/*.c) SOURCE_FILES += $(wildcard apps/*.c linker/*.c libc/*.c libc/*/*.c lib/*.c)
tags: $(SOURCE_FILES) tags: $(SOURCE_FILES) $(wildcard kuroko/src/*.c kuroko/src/*.h)
ctags -f tags $(SOURCE_FILES) ctags -f tags $(SOURCE_FILES) $(wildcard kuroko/src/*.c kuroko/src/*.h)
## ##
# Files that must be present in the ramdisk (apps, libraries) # Files that must be present in the ramdisk (apps, libraries)
@ -203,11 +203,12 @@ kuroko/%.o: kuroko/%.c
KUROKO_CMODS=$(patsubst kuroko/src/module_%.c,%,$(wildcard kuroko/src/module_*.c)) $(patsubst lib/kuroko/%.c,%,$(wildcard lib/kuroko/*.c)) KUROKO_CMODS=$(patsubst kuroko/src/module_%.c,%,$(wildcard kuroko/src/module_*.c)) $(patsubst lib/kuroko/%.c,%,$(wildcard lib/kuroko/*.c))
KUROKO_CMODS_X=$(foreach lib,$(KUROKO_CMODS),base/usr/local/lib/kuroko/$(lib).so) KUROKO_CMODS_X=$(foreach lib,$(KUROKO_CMODS),base/usr/local/lib/kuroko/$(lib).so)
KUROKO_CMODS_Y=$(foreach lib,$(KUROKO_CMODS),.make/$(lib).kmak) KUROKO_CMODS_Y=$(foreach lib,$(KUROKO_CMODS),.make/$(lib).kmak)
KUROKO_KRK_MODS=$(patsubst kuroko/modules/%.krk,base/usr/local/lib/kuroko/%.krk,$(wildcard kuroko/modules/*.krk)) KUROKO_KRK_MODS=$(patsubst kuroko/modules/%.krk,base/usr/local/lib/kuroko/%.krk,$(wildcard kuroko/modules/*.krk kuroko/modules/*/*.krk))
KUROKO_FILES=$(KUROKO_CMODS_X) $(KUROKO_KRK_MODS) base/lib/libkuroko.so KUROKO_FILES=$(KUROKO_CMODS_X) $(KUROKO_KRK_MODS) base/lib/libkuroko.so
base/usr/local/lib/kuroko/%.krk: kuroko/modules/%.krk base/usr/local/lib/kuroko/%.krk: kuroko/modules/%.krk
@mkdir -p `dirname $@`
cp $< $@ cp $< $@
.make/%.kmak: kuroko/src/module_%.c util/auto-dep.py | dirs .make/%.kmak: kuroko/src/module_%.c util/auto-dep.py | dirs

11
apps/highlight-source.krk Executable file
View File

@ -0,0 +1,11 @@
#!/bin/kuroko
import fileio, syntax.highlighter, kuroko
let code
with fileio.open(kuroko.argv[-1]) as f:
code = f.read()
let highlighter = syntax.highlighter.KurokoHighlighter(code)
highlighter.highlight()
syntax.highlighter.toTerminal(highlighter.process())

2
kuroko

@ -1 +1 @@
Subproject commit 3e9061502108a80c4873a4d8dcff5e97ef55e538 Subproject commit 50e490217070f9dbe085bc57637b12085b14b713