branch: externals/poke-mode
commit 2266bd2d8f1cd4d1da2c46e890d9b80b72d2f2b9
Author: Jose E. Marchesi <[email protected]>
Commit: Jose E. Marchesi <[email protected]>
Change keywords defFOO to FOO.
This commit changes the keywords `defunit', `defvar', `deftype' and
`defun' to `unit', `var', `type' and `fun' respectively.
2020-11-07 Jose E. Marchesi <[email protected]>
* libpoke/pkl-tab.y: Rename tokens def{var,type,fun,unit} to
{var,type,fun,unit}.
* libpoke/pkl-lex.l: Likewise.
* libpoke/pkl-rt.pk: Adjust accordingly.
* libpoke/std.pk: Likewise.
* poke/poke.pk: Likewise.
* poke/pk-copy.pk: Likewise.
* poke/pk-dump.pk: Likewise.
* poke/pk-extract.pk: Likewise.
* poke/pk-save.pk: Likewise.
* poke/pk-cmd.pk: Likewise.
* pickles/bmp.pk: Likewise.
* pickles/bpf.pk: Likewise.
* pickles/btf.pk: Likewise.
* pickles/color.pk: Likewise.
* pickles/ctf.pk: Likewise.
* pickles/dwarf-common.pk: Likewise.
* pickles/dwarf-expr.pk: Likewise.
* pickles/dwarf-frame.pk: Likewise.
* pickles/dwarf-info.pk: Likewise.
* pickles/dwarf-pubnames.pk: Likewise.
* pickles/dwarf-types.pk: Likewise.
* pickles/elf.pk: Likewise.
* pickles/id3v1.pk: Likewise.
* pickles/id3v2.pk: Likewise.
* pickles/leb128.pk: Likewise.
* pickles/rgb24.pk: Likewise.
* pickles/time.pk: Likewise.
* poke/pk-cmd.c (pk_cmd_exec): Likewise.
* etc/poke.g4 (declaration): Likewise.
* etc/poke-mode.el: Likewise.
* poke/pk-map.c (pk_map_load_parsed_map): Likewise.
* poke/pk-mi.c: Likewise.
* maps/dwarf.map: Likewise.
* doc/poke.texi: Likewise.
* testsuite/poke.cmd/*.pk: Likewise.
* testsuite/poke.pkl/*.pk: Likewise.
* testsuite/poke.map/*.pk: Likeiwise.
* testsuite/poke.libpoke/*.pk: Likewise.
* testsuite/poke.id3v1/*.pk: Likewise.
* testsuite/poke.color/*.pk: Likewise.
* testsuite/poke.repl/repl.exp: Likewise.
* testsuite/poke.std/*.pk: Likewise.
* testsuite/poke.mi-json/pk_sct.json: Likewise.
* utils/elfextractor: Likewise.
* HACKING: Likewise.
* TODO: Likewise.
---
poke-mode.el | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/poke-mode.el b/poke-mode.el
index a4d5dacbc3..a5e4387e98 100644
--- a/poke-mode.el
+++ b/poke-mode.el
@@ -68,13 +68,13 @@
;; from libpoke/pkl-lex.l
(defconst poke-keywords
'("pinned" "struct" "union" "else" "while" "until" "for" "in" "where" "if"
- "sizeof" "defun" "method" "deftype" "defvar" "defunit" "break" "return"
+ "sizeof" "fun" "method" "type" "var" "unit" "break" "return"
"as" "try" "catch" "raise" "any" "print" "printf" "isa"
"unmap" "big" "little" "load")
"List of the main keywords of the Poke language.")
;; from libpoke/pkl-lex.l
-;; from perl -nE 'say qq{"$1"} if /^deftype (\S+)/' libpoke/*.pk
+;; from perl -nE 'say qq{"$1"} if /^type (\S+)/' libpoke/*.pk
(defconst poke-builtin-types
'("string" "void" "int" "uint" "offset"
"Exception"
@@ -88,7 +88,7 @@
"POSIX_Time32" "POSIX_Time64")
"List of Poke builtin types.")
-;; from perl -nE 'say qq{"$1"} if /^defun (\S+)/ && $1 !~ /_pkl/' libpoke/*.pk
+;; from perl -nE 'say qq{"$1"} if /^fun (\S+)/ && $1 !~ /_pkl/' libpoke/*.pk
(defconst poke-builtin-functions
'("rand" "get_endian" "set_endian" "get_ios" "set_ios" "open"
"close" "iosize" "getenv" "exit"
@@ -96,7 +96,7 @@
"crc32" "ptime")
"List of Poke builtin functions.")
-;; from perl -nE 'say qq{"$1"} if /^defvar (\S+)/ && $1 !~ /^EC?_/'
libpoke/*.pk
+;; from perl -nE 'say qq{"$1"} if /^var (\S+)/ && $1 !~ /^EC?_/' libpoke/*.pk
(defconst poke-builtin-constants
'("ENDIAN_LITTLE" "ENDIAN_BIG"
"IOS_F_READ" "IOS_F_WRITE" "IOS_F_TRUNCATE" "IOS_F_CREATE"
@@ -104,7 +104,7 @@
"load_path" "NULL")
"List of Poke builtin constants and variables.")
-;; from perl -nE 'say qq{"$1"} if /defvar (EC?_\S+)/' libpoke/*.pk
+;; from perl -nE 'say qq{"$1"} if /var (EC?_\S+)/' libpoke/*.pk
(defconst poke-builtin-exceptions
'("EC_generic" "EC_div_by_zero" "EC_no_ios" "EC_no_return" "EC_out_of_bounds"
"EC_map_bounds" "EC_eof" "EC_map" "EC_conv" "EC_elem" "EC_constraint"
@@ -203,9 +203,9 @@
(id "=" inst)
(id "=" id ":" inst))
(decl
- ("defvar" definition)
+ ("var" definition)
("method" definition)
- ("deftype" definition)
+ ("type" definition)
(decl ";" decl))
(inst
(id)
