Inicio Explorar Axuda
Rexistro Iniciar sesión
PSG
/
civetweb
réplica de https://github.com/civetweb/civetweb.git
5
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

Support <?= in LSP

bel %!s(int64=11) %!d(string=hai) anos
pai
0b6cb15ea2
achega
5a51795323
Modificáronse 2 ficheiros con 77 adicións e 12 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 56 3
      src/mod_lua.inl
  2. 21 9
      test/page.lp

+ 56 - 3
src/mod_lua.inl
Ver ficheiro 

@@ -174,16 +174,57 @@ static void lsp_abort(lua_State *L)
 
     lua_error(L);
 
     lua_error(L);
 
 }
 
 }
 
 
 
+struct lsp_var_reader_data
 
+{
 
+    const char * begin;
 
+    unsigned len;
 
+    unsigned state;
 
+};
 
+
 
+static const char * lsp_var_reader(lua_State *L, void *ud, size_t *sz)
 
+{
 
+    struct lsp_var_reader_data * reader = (struct lsp_var_reader_data *)ud;
 
+    const char * ret;
 
+
 
+    switch (reader->state) {
 
+        case 0:
 
+            ret = "mg.write(";
 
+            *sz = strlen(ret);
 
+            break;
 
+        case 1:
 
+            ret = reader->begin;
 
+            *sz = reader->len;
 
+            break;
 
+        case 2:
 
+            ret = ")";
 
+            *sz = strlen(ret);
 
+            break;
 
+        default:
 
+            ret = 0;
 
+            *sz = 0;
 
+    }
 
+
 
+    reader->state++;
 
+    return ret;
 
+}
 
+
 
 static int lsp(struct mg_connection *conn, const char *path,
 
 static int lsp(struct mg_connection *conn, const char *path,
 
     const char *p, int64_t len, lua_State *L)
 
     const char *p, int64_t len, lua_State *L)
 
 {
 
 {
 
-    int i, j, pos = 0, lines = 1, lualines = 0;
 
+    int i, j, pos = 0, lines = 1, lualines = 0, is_var, lua_ok;
 
     char chunkname[MG_BUF_LEN];
 
     char chunkname[MG_BUF_LEN];
 
+    struct lsp_var_reader_data data;
 
 
 
     for (i = 0; i < len; i++) {
 
     for (i = 0; i < len; i++) {
 
         if (p[i] == '\n') lines++;
 
         if (p[i] == '\n') lines++;
 
         if ((i + 1) < len && p[i] == '<' && p[i + 1] == '?') {
 
         if ((i + 1) < len && p[i] == '<' && p[i + 1] == '?') {
 
-            for (j = i + 1; j < len ; j++) {
 
+
 
+            is_var = ((i + 2) < len && p[i + 2] == '=');
 
+
 
+            if (is_var) j = i + 2;
 
+            else j = i + 1;
 
+
 
+            while (j < len) {
 
                 if (p[j] == '\n') lualines++;
 
                 if (p[j] == '\n') lualines++;
 
                 if ((j + 1) < len && p[j] == '?' && p[j + 1] == '>') {
 
                 if ((j + 1) < len && p[j] == '?' && p[j + 1] == '>') {
 
                     mg_write(conn, p + pos, i - pos);
 
                     mg_write(conn, p + pos, i - pos);
 
@@ -191,7 +232,17 @@ static int lsp(struct mg_connection *conn, const char *path,
 
                     snprintf(chunkname, sizeof(chunkname), "@%s+%i", path, lines);
 
                     snprintf(chunkname, sizeof(chunkname), "@%s+%i", path, lines);
 
                     lua_pushlightuserdata(L, conn);
 
                     lua_pushlightuserdata(L, conn);
 
                     lua_pushcclosure(L, lsp_error, 1);
 
                     lua_pushcclosure(L, lsp_error, 1);
 
-                    if (luaL_loadbuffer(L, p + (i + 2), j - (i + 2), chunkname)) {
 
+
 
+                    if (is_var) {
 
+                        data.begin = p + (i + 3);
 
+                        data.len = j - (i + 3);
 
+                        data.state = 0;
 
+                        lua_ok = lua_load(L, lsp_var_reader, &data, chunkname, NULL);
 
+                    } else {
 
+                        lua_ok = luaL_loadbuffer(L, p + (i + 2), j - (i + 2), chunkname);
 
+                    }
 
+
 
+                    if (lua_ok) {
 
                         /* Syntax error or OOM. Error message is pushed on stack. */
 
                         /* Syntax error or OOM. Error message is pushed on stack. */
 
                         lua_pcall(L, 1, 0, 0);
 
                         lua_pcall(L, 1, 0, 0);
 
                     } else {
 
                     } else {
 
@@ -203,7 +254,9 @@ static int lsp(struct mg_connection *conn, const char *path,
 
                     i = pos - 1;
 
                     i = pos - 1;
 
                     break;
 
                     break;
 
                 }
 
                 }
 
+                j++;
 
             }
 
             }
 
+
 
             if (lualines > 0) {
 
             if (lualines > 0) {
 
                 lines += lualines;
 
                 lines += lualines;
 
                 lualines = 0;
 
                 lualines = 0;

+ 21 - 9
test/page.lp
Ver ficheiro 

@@ -4,17 +4,28 @@ Content-Type: text/html
 
 <html><body>
 
 <html><body>
 
 
 
 
 
-<p>This is an example Lua server page served by
 
+<p>This is another example of a Lua server page, served by
 
 <a href="http://code.google.com/p/civetweb">Civetweb web server</a>.
 
 <a href="http://code.google.com/p/civetweb">Civetweb web server</a>.
 
-Civetweb has Lua, Sqlite, and other functionality built in the binary.
 
-This example page stores the request in the Sqlite database, and shows
 
-all requests done previously.</p>
 
-<p> Today is <? mg.write(os.date("%A")) ?>
 
+</p><p>
 
+The following features are available:
 
+<ul>
 
+<?
 
+  mg.write("<li>" .. _VERSION .. " server pages</li>")
 
+  if sqlite3 then
 
+    mg.write("<li>sqlite3 binding</li>")
 
+  end
 
+  if lfs then
 
+    mg.write("<li>lua file system</li>")
 
+  end
 
+?>
 
+</ul></p>
 
+<p> Today is <? mg.write(os.date("%A")) ?></p>
 
+<p> URI is <? mg.write(mg.request_info.uri) ?></p>
 
+<p> URI is <?=mg.request_info.uri?></p>
 
 
 
+<p>Database example:
 
 <pre>
 
 <pre>
 
 <?
 
 <?
 
-  -- for k,v in pairs(_G) do mg.write(k, '\n') end
 
-
 
   -- Open database
 
   -- Open database
 
   local db = sqlite3.open('requests.db')
 
   local db = sqlite3.open('requests.db')
 
 
 
@@ -32,7 +43,6 @@ all requests done previously.</p>
 
     );
 
     );
 
   ]])
 
   ]])
 
 
 
-
 
   -- Add entry about this request
 
   -- Add entry about this request
 
   local stmt = db:prepare(
 
   local stmt = db:prepare(
 
     'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?);');
 
     'INSERT INTO requests VALUES(NULL, datetime("now"), ?, ?, ?);');
 
@@ -54,4 +64,6 @@ all requests done previously.</p>
 
   -- Close database
 
   -- Close database
 
   db:close()
 
   db:close()
 
 ?>
 
 ?>
 
-</pre></body></html>
 
+</pre></p>
 
+
 
+</body></html>