:art: Improve escape

diff --git a/include/escape.h b/include/escape.h
index fcf4b7cb95110439a5a6dd9281453bd64ab2c454..463f5661801b8d603eb592a2c4d5aac3bc43f040 100644 (file)
--- a/include/escape.h
+++ b/include/escape.h
@@ -1,6 +1,6 @@
 #ifndef __ESCAPE
 #define __ESCAPE
 char* escape_table(MemPool);
-ANN m_int str2char(const Emitter, const m_str, const loc_t);
+ANN char str2char(const Emitter, const m_str, const loc_t);
 ANN m_bool escape_str(const Emitter, m_str, const loc_t);
 #endif

diff --git a/src/emit/emit.c b/src/emit/emit.c
index 90940c0a35286a1c9aa9eed9e9a2581d23392246..ba1fc8736fb6926b114c6b0d6b49e4b8cef0889b 100644 (file)
--- a/src/emit/emit.c
+++ b/src/emit/emit.c
@@ -453,7 +453,7 @@ ANN static m_bool emit_prim_float(const Emitter emit, const m_float *fnum) {
 }
 
 ANN static m_bool emit_prim_char(const Emitter emit, const m_str *str) {
-  DECL_BB(const m_int, c, = str2char(emit, *str, prim_pos(str)))
+  const char c = str2char(emit, *str, prim_pos(str));
   regpushi(emit, c);
   return GW_OK;
 }

diff --git a/src/emit/escape.c b/src/emit/escape.c
index 3bef0a789203632b20efa4cec4cbe087e31e3a80..62d0ce79a811f36be140171632cb08b13d77ad46 100644 (file)
--- a/src/emit/escape.c
+++ b/src/emit/escape.c
@@ -72,6 +72,6 @@ m_bool escape_str(const Emitter emit, const m_str base, const loc_t pos) {
   return GW_OK;
 }
 
-ANN m_int str2char(const Emitter emit, const m_str c, const loc_t pos) {
+ANN char str2char(const Emitter emit, const m_str c, const loc_t pos) {
   return c[0] != '\\' ? c[0] : get_escape(emit, c[1], pos);
 }