Next master drop

.gdbinitlua

@@ -3,9 +3,9 @@ set pagination off
 set print null-stop
 
 define prTS
-  set $o = &(((TString *)($arg0))->tsv)
+  set $o = &(((TString *)(($arg0).value))->tsv)
   printf "Common header: next = %p, marked = 0x%01x\n", $o->next, $o->marked
-  printf "String: hash = 0x%08x, len = %u : %s\n", $o->hash, $o->len, (char *)(&$o[1])
+  printf "String: hash = 0x%08x, len = %u : %s\n", $o->hash, $o->len, (char *)($o+1)
 end
 
 define prTnodes
@@ -24,6 +24,18 @@ define prTnodes
     set $i = $i +1
   end
 end
+
+define prTarray
+  set $o = (Table *)($arg0)
+  set $n = $o->sizearray
+  set $i = 0
+  while $i < $n
+    set $nd = ($o->array) + $i
+    prTV $nd
+    set $i = $i +1
+  end
+end
+
 define prTV
   if $arg0
     set $type = ($arg0).tt
@@ -78,6 +90,10 @@ define prTV
     end
     if $type == 9
       # UserData
+      set $o = &($val->gc.u.uv)
+      printf "Common header: next = %p, marked = 0x%01x\n", $o->next, $o->marked
+      printf "UD = %p Userdata: metatable = ", ($o+1))
+      print ($o)->metatable
     end
     if $type == 10
       # Thread

.gitignore

@@ -16,6 +16,7 @@ tools/toolchains/
 .project
 .settings/
 .vscode
+.vs
 
 #ignore temp file for build infos
 buildinfo.h

.travis.yml

@@ -20,6 +20,7 @@ addons:
     packages:
     - python-serial
     - srecord
+    - luarocks
 cache:
   - directories:
     - cache
@@ -33,4 +34,5 @@ script:
 - echo "checking:"
 - find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo
 - find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 $LUACC -p
-# - if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/run-luacheck.sh || true ; fi
+- if [ "$OS" = "linux" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/run-luacheck-linux.sh; fi
+- if [ "$OS" = "windows" ]; then bash "$TRAVIS_BUILD_DIR"/tools/travis/run-luacheck-windows.sh; fi

Makefile

@@ -109,7 +109,7 @@ ifneq (,$(findstring indows,$(OS)))
   else
     # It is gcc, may be cygwin
     # Can we use -fdata-sections?
-    CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections
+    CCFLAGS += -ffunction-sections -fno-jump-tables -fdata-sections -fpack-struct=4
     AR = xtensa-lx106-elf-ar
     CC = xtensa-lx106-elf-gcc
     CXX = xtensa-lx106-elf-g++

app/Makefile

@@ -15,6 +15,13 @@ TARGET = eagle
 #FLAVOR = release
 FLAVOR = debug
 
+# Handle Lua Directory selector
+ifeq ("$(LUA)","53")
+  LUA_DIR := lua53
+else
+  LUA_DIR := lua
+endif
+
 ifndef PDIR # {
 GEN_IMAGES= eagle.app.v6.out
 GEN_BINS= eagle.app.v6.bin
@@ -34,16 +41,15 @@ SUBDIRS= 					\
 	mbedtls 				\
 	platform 				\
 	libc 					\
-	lua 					\
+	$(LUA_DIR)				\
 	lwip 					\
-	task 					\
 	smart 					\
 	modules 				\
 	spiffs 					\
-	net						\
+	net					\
 	fatfs					\
 	esp-gdbstub				\
-	pm						\
+	pm					\
 	uzlib					\
 	$(OPT_SEL_MKTARGETS)
 
@@ -64,10 +70,9 @@ COMPONENTS_eagle.app.v6 = 		\
 	user/libuser.a 				\
 	crypto/libcrypto.a			\
 	driver/libdriver.a 			\
-	platform/libplatform.a		\
-	task/libtask.a 				\
+	platform/libplatform.a 		\
 	libc/liblibc.a 				\
-	lua/liblua.a 				\
+	$(LUA_DIR)/liblua.a 		\
 	lwip/liblwip.a 				\
 	smart/smart.a 				\
 	spiffs/spiffs.a 			\
@@ -152,7 +157,7 @@ DDEFINES += 						\
 #
 # Required for each makefile to inherit from the parent
 #
-INCLUDES := -I $(PDIR)libc -I $(PDIR)lua -I $(PDIR)platform \
+INCLUDES := -I $(PDIR)libc -I $(PDIR)$(LUA_DIR) -I $(PDIR)platform \
             $(INCLUDES) -I $(PDIR) -I $(PDIR)include 
 PDIR := ../$(PDIR)
 

app/coap/endpoints.c

@@ -162,20 +162,29 @@ static int handle_post_function(const coap_endpoint_t *ep, coap_rw_buffer_t *scr
     return coap_make_response(scratch, outpkt, NULL, 0, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_NOT_FOUND, COAP_CONTENTTYPE_NONE);
 }
 
-extern int lua_put_line(const char *s, size_t l);
-
 static const coap_endpoint_path_t path_command = {2, {"v1", "c"}};
 static int handle_post_command(const coap_endpoint_t *ep, coap_rw_buffer_t *scratch, const coap_packet_t *inpkt, coap_packet_t *outpkt, uint8_t id_hi, uint8_t id_lo)
 {
     if (inpkt->payload.len == 0)
         return coap_make_response(scratch, outpkt, NULL, 0, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_BAD_REQUEST, COAP_CONTENTTYPE_TEXT_PLAIN);
     if (inpkt->payload.len > 0)
     {
-        char line[LUA_MAXINPUT];
-        if (!coap_buffer_to_string(line, LUA_MAXINPUT, &inpkt->payload) &&
-            lua_put_line(line, strlen(line))) {
-            NODE_DBG("\nResult(if any):\n");
-            system_os_post (LUA_TASK_PRIO, LUA_PROCESS_LINE_SIG, 0);
+        char line[LUA_MAXINPUT+1];
+        if (!coap_buffer_to_string(line, LUA_MAXINPUT, &inpkt->payload)) {
+            lua_State *L = lua_getstate();
+            int base = lua_gettop(L), n, status;
+            int l = strlen(line);
+            line[l++] = '\n';
+            /* compile and exec payload; any error or results will be left on the stack and printed */
+            /* TODO: consider returning output as result instead of printing */ 
+            luaL_dostring(L, line);
+            if ((n = lua_gettop(L) - base) > 0)
+            {
+                lua_getglobal(L, "print");
+                lua_insert(L, base);
+                lua_pcall(L, n, 0, 0);
+                lua_settop(L, base);
+            }
         }
         return coap_make_response(scratch, outpkt, NULL, 0, id_hi, id_lo, &inpkt->tok, COAP_RSPCODE_CONTENT, COAP_CONTENTTYPE_TEXT_PLAIN);
     }

app/crypto/digests.c

@@ -37,10 +37,6 @@
 #include <strings.h>
 #include <errno.h>
 
-#ifdef MD2_ENABLE
-#include "ssl/ssl_crypto.h"
-#endif
-
 #ifdef SHA2_ENABLE
 #include "sha2.h"
 #endif
@@ -60,9 +56,6 @@ typedef char ensure_int_and_size_t_same[(sizeof(int)==sizeof(size_t)) ? 0 : -1];
 
 static const digest_mech_info_t hash_mechs[] ICACHE_RODATA_ATTR =
 {
-#ifdef MD2_ENABLE
-   MECH(MD2, _ , MD2_SIZE,  16),
-#endif
    MECH(MD5,   , MD5_DIGEST_LENGTH,  64)
   ,MECH(SHA1,  , SHA1_DIGEST_LENGTH, 64)
 #ifdef SHA2_ENABLE

app/driver/Makefile

@@ -15,7 +15,7 @@ ifndef PDIR
 GEN_LIBS = libdriver.a
 endif
 
-STD_CFLAGS=-std=gnu11 -Wimplicit
+STD_CFLAGS=-std=gnu11 -Wimplicit -Wall
 
 #############################################################
 # Configuration i.e. compile options etc.