precompile on startup

doc/areas/noise.txt

@@ -7,3 +7,4 @@ gen_noise32
 gen_noise64
 gen_float
 gen_int
+gen_sha1

doc/pages/gen_sha1.txt

@@ -8,3 +8,6 @@ return value : the resulting hash value
 
 :desc
 Returns the sha1 hash of 's'.
+
+:see
+>noise

examples/blog/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) HTML5 Boilerplate
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/blog/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square70x70logo src="tile.png"/>
+      <square150x150logo src="tile.png"/>
+      <wide310x150logo src="tile-wide.png"/>
+      <square310x310logo src="tile.png"/>
+    </tile>
+  </msapplication>
+</browserconfig>

examples/blog/css/main.css

@@ -0,0 +1,263 @@
+/*! HTML5 Boilerplate v8.0.0 | MIT License | https://html5boilerplate.com/ */
+
+/* main.css 2.1.0 | MIT License | https://github.com/h5bp/main.css#readme */
+/*
+ * What follows is the result of much research on cross-browser styling.
+ * Credit left inline and big thanks to Nicolas Gallagher, Jonathan Neal,
+ * Kroc Camen, and the H5BP dev community and team.
+ */
+
+/* ==========================================================================
+   Base styles: opinionated defaults
+   ========================================================================== */
+
+html {
+  color: #222;
+  font-size: 1em;
+  line-height: 1.4;
+}
+
+/*
+ * Remove text-shadow in selection highlight:
+ * https://twitter.com/miketaylr/status/12228805301
+ *
+ * Vendor-prefixed and regular ::selection selectors cannot be combined:
+ * https://stackoverflow.com/a/16982510/7133471
+ *
+ * Customize the background color to match your design.
+ */
+
+::-moz-selection {
+  background: #b3d4fc;
+  text-shadow: none;
+}
+
+::selection {
+  background: #b3d4fc;
+  text-shadow: none;
+}
+
+/*
+ * A better looking default horizontal rule
+ */
+
+hr {
+  display: block;
+  height: 1px;
+  border: 0;
+  border-top: 1px solid #ccc;
+  margin: 1em 0;
+  padding: 0;
+}
+
+/*
+ * Remove the gap between audio, canvas, iframes,
+ * images, videos and the bottom of their containers:
+ * https://github.com/h5bp/html5-boilerplate/issues/440
+ */
+
+audio,
+canvas,
+iframe,
+img,
+svg,
+video {
+  vertical-align: middle;
+}
+
+/*
+ * Remove default fieldset styles.
+ */
+
+fieldset {
+  border: 0;
+  margin: 0;
+  padding: 0;
+}
+
+/*
+ * Allow only vertical resizing of textareas.
+ */
+
+textarea {
+  resize: vertical;
+}
+
+/* ==========================================================================
+   Author's custom styles
+   ========================================================================== */
+
+/* ==========================================================================
+   Helper classes
+   ========================================================================== */
+
+/*
+ * Hide visually and from screen readers
+ */
+
+.hidden,
+[hidden] {
+  display: none !important;
+}
+
+/*
+ * Hide only visually, but have it available for screen readers:
+ * https://snook.ca/archives/html_and_css/hiding-content-for-accessibility
+ *
+ * 1. For long content, line feeds are not interpreted as spaces and small width
+ *    causes content to wrap 1 word per line:
+ *    https://medium.com/@jessebeach/beware-smushed-off-screen-accessible-text-5952a4c2cbfe
+ */
+
+.sr-only {
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
+  white-space: nowrap;
+  width: 1px;
+  /* 1 */
+}
+
+/*
+ * Extends the .sr-only class to allow the element
+ * to be focusable when navigated to via the keyboard:
+ * https://www.drupal.org/node/897638
+ */
+
+.sr-only.focusable:active,
+.sr-only.focusable:focus {
+  clip: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  position: static;
+  white-space: inherit;
+  width: auto;
+}
+
+/*
+ * Hide visually and from screen readers, but maintain layout
+ */
+
+.invisible {
+  visibility: hidden;
+}
+
+/*
+ * Clearfix: contain floats
+ *
+ * For modern browsers
+ * 1. The space content is one way to avoid an Opera bug when the
+ *    `contenteditable` attribute is included anywhere else in the document.
+ *    Otherwise it causes space to appear at the top and bottom of elements
+ *    that receive the `clearfix` class.
+ * 2. The use of `table` rather than `block` is only necessary if using
+ *    `:before` to contain the top-margins of child elements.
+ */
+
+.clearfix::before,
+.clearfix::after {
+  content: " ";
+  display: table;
+}
+
+.clearfix::after {
+  clear: both;
+}
+
+/* ==========================================================================
+   EXAMPLE Media Queries for Responsive Design.
+   These examples override the primary ('mobile first') styles.
+   Modify as content requires.
+   ========================================================================== */
+
+@media only screen and (min-width: 35em) {
+  /* Style adjustments for viewports that meet the condition */
+}
+
+@media print,
+  (-webkit-min-device-pixel-ratio: 1.25),
+  (min-resolution: 1.25dppx),
+  (min-resolution: 120dpi) {
+  /* Style adjustments for high resolution devices */
+}
+
+/* ==========================================================================
+   Print styles.
+   Inlined to avoid the additional HTTP request:
+   https://www.phpied.com/delay-loading-your-print-css/
+   ========================================================================== */
+
+@media print {
+  *,
+  *::before,
+  *::after {
+    background: #fff !important;
+    color: #000 !important;
+    /* Black prints faster */
+    box-shadow: none !important;
+    text-shadow: none !important;
+  }
+
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  a[href]::after {
+    content: " (" attr(href) ")";
+  }
+
+  abbr[title]::after {
+    content: " (" attr(title) ")";
+  }
+
+  /*
+   * Don't show links that are fragment identifiers,
+   * or use the `javascript:` pseudo protocol
+   */
+  a[href^="#"]::after,
+  a[href^="javascript:"]::after {
+    content: "";
+  }
+
+  pre {
+    white-space: pre-wrap !important;
+  }
+
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+
+  /*
+   * Printing Tables:
+   * https://web.archive.org/web/20180815150934/http://css-discuss.incutio.com/wiki/Printing_Tables
+   */
+  thead {
+    display: table-header-group;
+  }
+
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+

examples/blog/css/normalize.css

@@ -0,0 +1,349 @@
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+  border-style: none;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+  -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
+}

examples/blog/humans.txt

@@ -0,0 +1,15 @@
+# humanstxt.org/
+# The humans responsible & technology colophon
+
+# TEAM
+
+    <name> -- <role> -- <twitter>
+
+# THANKS
+
+    <name>
+
+# TECHNOLOGY COLOPHON
+
+    CSS3, HTML5
+    Apache Server Configs, jQuery, Modernizr, Normalize.css

examples/blog/index.uce

@@ -1,10 +1,7 @@
 #load "config/settings.uce"
-#load "lib.uce"
+#load "lib/site.uce"
 
 RENDER()
 {
-	<>
+	render_file("pages/page.html.uce");
-	Hello world23
-	<?= bla("!x") ?>
-	</>
 }

examples/blog/js/plugins.js

@@ -0,0 +1,24 @@
+// Avoid `console` errors in browsers that lack a console.
+(function() {
+  var method;
+  var noop = function () {};
+  var methods = [
+    'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
+    'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
+    'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
+    'timeline', 'timelineEnd', 'timeStamp', 'trace', 'warn'
+  ];
+  var length = methods.length;
+  var console = (window.console = window.console || {});
+
+  while (length--) {
+    method = methods[length];
+
+    // Only stub undefined methods.
+    if (!console[method]) {
+      console[method] = noop;
+    }
+  }
+}());
+
+// Place any jQuery/helper plugins in here.

examples/blog/lib/site.uce

@@ -1,4 +1,4 @@
-
+EXPORT
 String bla(String x)
 {
 	return(x + "!");

examples/blog/pages/page.html.uce

@@ -0,0 +1,47 @@
+
+EXPORT DTree* my_custom_func(DTree* var)
+{
+	<>
+	Hello
+	</>
+	return(0);
+}
+
+RENDER()
+{
+	<><!doctype html>
+	<html class="no-js" lang="">
+
+	<head>
+	  <meta charset="utf-8">
+	  <title></title>
+	  <meta name="description" content="">
+	  <meta name="viewport" content="width=device-width, initial-scale=1">
+
+	  <meta property="og:title" content="">
+	  <meta property="og:type" content="">
+	  <meta property="og:url" content="">
+	  <meta property="og:image" content="">
+
+	  <link rel="manifest" href="site.webmanifest">
+	  <link rel="apple-touch-icon" href="icon.png">
+
+	  <link rel="stylesheet" href="css/normalize.css">
+	  <link rel="stylesheet" href="css/main.css">
+
+	  <meta name="theme-color" content="#606060">
+	</head>
+
+	<body>
+	<?
+		String view_name = safe_name(first(context->get["view"], "default")) + ".uce";
+		if(file_exists(view_name))
+			render_file(view_name);
+		else
+			print("view not found");
+	?>
+	</body>
+
+	</html>
+	</>
+}

examples/blog/robots.txt

@@ -0,0 +1,5 @@
+# www.robotstxt.org/
+
+# Allow crawling of all content
+User-agent: *
+Disallow:

examples/blog/site.webmanifest

@@ -0,0 +1,12 @@
+{
+  "short_name": "",
+  "name": "",
+  "icons": [{
+    "src": "icon.png",
+    "type": "image/png",
+    "sizes": "192x192"
+  }],
+  "start_url": "/?utm_source=homescreen",
+  "background_color": "#fafafa",
+  "theme_color": "#fafafa"
+}

scripts/compile

@@ -9,6 +9,8 @@ SRC_FN="$3"
 PP_FN="$4"
 SO_FN="$5"
 
+LINK_OBJECTS="$6"
+
 #echo "Source Dir: $SRC_DIR"
 #echo "Dest Dir: $DEST_DIR"
 #echo "Source File: $SRC_FN"
@@ -32,6 +34,10 @@ SRCFLAGS="-D PLATFORM_NAME=\"linux\""
 # echo "Compliling executable..."
 $COMPILER "$DEST_DIR/$PP_FN" $SRCFLAGS $FLAGS $LIBS -o "$DEST_DIR/$SO_FN"
 
+# separate .o file
+#$COMPILER -c "$DEST_DIR/$PP_FN" $SRCFLAGS $FLAGS $LIBS -o "$DEST_DIR/$PP_FN.o"
+#$COMPILER "$DEST_DIR/$PP_FN.o" "$LINK_OBJECTS" $SRCFLAGS $FLAGS $LIBS -o "$DEST_DIR/$SO_FN"
+
 if [ $? -eq 0 ]
 then
 	# ls -lh "$DEST_DIR"

src/lib/compiler.cpp

@@ -159,13 +159,14 @@ String preprocess_shared_unit_char_wise(Request* context, SharedUnit* su, String
 					pc.append("#include \"" + sub_su->bin_path + "/" + sub_su->pre_file_name + "\"\n");
 				}
 			}
-			else if(current_line.length() == 4 && current_line.substr(0, 4) == "API ")
+			else if(false && current_line.substr(0, 6) == "EXPORT" && isspace(current_line[6]))
 			{
 				auto end_declaration_pos = content.find("{", i);
 				if(end_declaration_pos != std::string::npos)
 				{
 					// remove string "API " from output
-					pc.resize(pc.length() - 4);
+					//pc.resize(pc.length() - 7);
+					pc.append(1, '\n');
 					String declaration = trim(content.substr(i, end_declaration_pos - i));
 					String return_type_and_name = nibble(declaration, "(");
 					StringList rtn_list = split_space(return_type_and_name);
@@ -208,7 +209,7 @@ void setup_unit_paths(Request* context, SharedUnit* su, String file_name)
 	su->pre_file_name = su->src_file_name + ".cpp";
 
 	su->so_name = su->bin_path + "/" + su->bin_file_name;
-	su->api_file_name = su->bin_path + "/" + su->src_file_name + ".api.txt";
+	su->api_file_name = su->bin_path + "/" + su->src_file_name + ".exports.txt";
 	su->setup_file_name = su->bin_path + "/" + su->src_file_name + ".setup.h";
 }
 
@@ -224,7 +225,7 @@ void load_shared_unit(Request* context, SharedUnit* su, String file_name)
 	{
 		if(su->opt_so_optional)
 			return;
-		printf("(i) unit file not found: %s\n", su->so_name.c_str());
+		//printf("(i) unit file not found: %s\n", su->so_name.c_str());
 		su->compiler_messages = "unit file not found";
 		return;
 	}
@@ -235,11 +236,11 @@ void load_shared_unit(Request* context, SharedUnit* su, String file_name)
 		su->last_compiled = file_mtime(su->so_name);
 		char *error;
 		su->on_setup = (request_handler)dlsym(su->so_handle, "set_current_request");
-		su->on_render = (call_handler)dlsym(su->so_handle, "render");
 		if ((error = dlerror()) != NULL)
 			printf("Error - %s in %s\n", error, su->file_name.c_str());
-		else
+		su->on_render = (call_handler)dlsym(su->so_handle, "render");
-			printf("(i) loaded unit %s\n", su->file_name.c_str());
+		//else
+		//	printf("(i) loaded unit %s\n", su->file_name.c_str());
 	}
 	else
 	{
@@ -253,7 +254,7 @@ String compile_setup_file(Request* context, SharedUnit* su)
 		String("#ifndef UCE_LIB_INCLUDED\n") +
 		"#define UCE_LIB_INCLUDED\n" +
 		("#include \"")+context->server->config.COMPILER_SYS_PATH +"/src/lib/uce_lib.h\" \n"+
-		file_get_contents(context->server->config.SETUP_TEMPLATE) +
+		file_get_contents(context->server->config.COMPILER_SYS_PATH + "/" + context->server->config.SETUP_TEMPLATE) +
 		"#endif \n";
 	StringList declarations;
 	StringList load_units;
@@ -296,7 +297,7 @@ void compile_shared_unit(Request* context, SharedUnit* su, String file_name)
 	else
 	{
 		load_shared_unit(context, su, file_name);
-		printf("(i) compiled unit %s\n", file_name.c_str());
+		//printf("(i) compiled unit %s\n", file_name.c_str());
 	}
 }
 
@@ -356,52 +357,18 @@ SharedUnit* get_shared_unit(Request* context, String file_name, bool opt_so_opti
 	return(su);
 }
 
-void compiler_invoke(Request* context, String file_name, DTree& call_param)
-{
-
-	if(file_name[0] != '/')
-	{
-		file_name = expand_path(file_name);
-	}
-	//printf("(i) invoke %s\n", file_name.c_str());
-
-	//printf("(i) invoke(%s)\n", file_name.c_str());
-	switch_to_system_alloc();
-	auto su = get_shared_unit(context, file_name);
-	switch_to_arena(context->mem);
-	if(!su)
-	{
-		printf("Error loading unit %s\n", file_name.c_str());
-		print("Error loading unit: "+file_name);
-	}
-	else if(su->compiler_messages.length() > 0)
-	{
-		context->header["Content-Type"] = "text/plain";
-		print(su->compiler_messages);
-	}
-	else if(!su->on_render)
-	{
-		context->header["Content-Type"] = "text/plain";
-		print("no RENDER() entry point");
-	}
-	else
-	{
-		String prev_wd = get_cwd();
-		set_cwd(su->src_path);
-		su->on_setup(context);
-		su->on_render(call_param);
-		set_cwd(prev_wd);
-	}
-}
-
 SharedUnit* compiler_load_shared_unit(Request* context, String file_name, String current_path, bool opt_so_optional)
 {
 
+	context->stats.invoke_count++;
+
 	if(file_name[0] != '/')
 	{
 		file_name = expand_path(file_name, current_path);
 	}
 
+	//printf("(i) load '%s'\n", file_name.c_str());
+
 	switch_to_system_alloc();
 	auto su = get_shared_unit(context, file_name, opt_so_optional);
 	switch_to_arena(context->mem);
@@ -413,7 +380,8 @@ SharedUnit* compiler_load_shared_unit(Request* context, String file_name, String
 	}
 	else if(su->compiler_messages.length() > 0)
 	{
-		context->header["Content-Type"] = "text/plain";
+		if(context->stats.invoke_count == 1)
+			context->header["Content-Type"] = "text/plain";
 		print(su->compiler_messages);
 		return(0);
 	}
@@ -424,3 +392,77 @@ SharedUnit* compiler_load_shared_unit(Request* context, String file_name, String
 
 }
 
+void compiler_invoke(Request* context, String file_name, DTree& call_param)
+{
+	auto su = compiler_load_shared_unit(context, file_name, "", false);
+	if(su)
+	{
+		if(!su->on_setup)
+		{
+			if(context->stats.invoke_count == 1)
+				context->header["Content-Type"] = "text/plain";
+			print("internal error: set_current_request() not defined in", file_name, "\n");
+		}
+		else if(!su->on_render)
+		{
+			if(context->stats.invoke_count == 1)
+				context->header["Content-Type"] = "text/plain";
+			print("no RENDER() entry point");
+		}
+		else
+		{
+			String prev_wd = get_cwd();
+			set_cwd(su->src_path);
+			su->on_setup(context);
+			su->on_render(call_param);
+			set_cwd(prev_wd);
+		}
+	}
+}
+
+void render_file(String file_name)
+{
+	//printf("(i) render_file(%s)\n", file_name.c_str());
+	DTree call_param;
+	compiler_invoke(context, file_name, call_param);
+}
+
+void render_file(String file_name, DTree& call_param)
+{
+	compiler_invoke(context, file_name, call_param);
+}
+
+DTree* call_file_function(String file_name, String function_name, DTree* call_param)
+{
+	DTree* result;
+	auto su = compiler_load_shared_unit(context, file_name, "", false);
+	if(su && su->so_handle)
+	{
+		if(!su->on_setup)
+		{
+			print("internal error: set_current_request() not defined in", file_name, "\n");
+		}
+		else
+		{
+			auto f = (dtree_call_handler)dlsym(su->so_handle, function_name.c_str());
+			if(!f)
+			{
+				print("Error: call_file_function() function '", function_name, "' not found");
+			}
+			else
+			{
+				String prev_wd = get_cwd();
+				set_cwd(su->src_path);
+				su->on_setup(context);
+				result = f(call_param);
+				set_cwd(prev_wd);
+			}
+		}
+	}
+	else
+	{
+		print("Error: call_file_function() could not load unit file '", file_name, "'");
+	}
+	return(result);
+}
+

src/lib/compiler.h

@@ -1,4 +1,5 @@
 #define RENDER() extern "C" void render(DTree& call)
+#define EXPORT extern "C"
 
 String process_html_literal(Request* context, SharedUnit* su, String content);
 String preprocess_shared_unit(Request* context, SharedUnit* su);
@@ -8,3 +9,9 @@ void compile_shared_unit(Request* context, SharedUnit* su, String file_name);
 SharedUnit* get_shared_unit(Request* context, String file_name, bool opt_so_optional = false);
 void compiler_invoke(Request* context, String file_name, DTree& call_param);
 SharedUnit* compiler_load_shared_unit(Request* context, String file_name, String current_path, bool opt_so_optional = false);
+
+void render_file(String file_name);
+void render_file(String file_name, DTree& call_param);
+DTree* call_file_function(String file_name, String function_name, DTree* call_param = 0);
+
+StringList precompile_jobs;

src/lib/functionlib.cpp

@@ -533,3 +533,13 @@ String ob_get_close()
 	return(result);
 }
 
+String safe_name(String raw)
+{
+	String result = "";
+	for(auto c : raw)
+	{
+		if(isalnum(c) || c == '_')
+			result.append(1, c);
+	}
+	return(result);
+}

src/lib/functionlib.h

@@ -60,5 +60,6 @@ void ob_start();
 void ob_clear();
 String ob_get_clear();
 String ob_get();
+String safe_name(String raw);
 
 #define is_bit_set(var,pos) ((var) & (1<<(pos)))

src/lib/sys.cpp

@@ -12,7 +12,7 @@
 
 String shell_exec(String cmd)
 {
-	printf("(i) shell_exec(%s)\n", cmd.c_str());
+	//printf("(i) shell_exec(%s)\n", cmd.c_str());
 	String data;
 	FILE * stream;
 	const int max_buffer = 256;

src/lib/types.cpp

@@ -39,6 +39,7 @@ String nibble(String div, String& haystack)
 	}
 }
 
+/*
 void Request::invoke(String file_name)
 {
 	DTree call_param;
@@ -50,6 +51,8 @@ void Request::invoke(String file_name, DTree& call_param)
 	compiler_invoke(this, file_name, call_param);
 }
 
+*/
+
 void Request::ob_start()
 {
 	ob_stack.push_back(new std::ostringstream());
@@ -61,3 +64,4 @@ Request::~Request()
 	for(auto& sockfd : resources.sockets)
 		close(sockfd);
 }
+

src/lib/types.h

@@ -141,6 +141,7 @@ struct Request;
 struct DTree;
 
 typedef void (*call_handler)(DTree& call_param);
+typedef DTree* (*dtree_call_handler)(DTree* call_param);
 typedef void (*request_handler)(Request* request);
 
 String to_string(s64 v) { return(std::to_string(v)); }
@@ -156,6 +157,8 @@ struct ServerSettings {
 	String TMP_UPLOAD_PATH = "/tmp/uce/uploads";
 	String SESSION_PATH = "/tmp/uce/sessions";
 	String COMPILER_SYS_PATH = ".";
+	String PRECOMPILE_FILES_IN = ".";
+
 	u32 LISTEN_PORT = 9993;
 	u64 SESSION_TIME = 60*60*24*30;
 	u32 WORKER_COUNT = 4;
@@ -260,6 +263,7 @@ struct Request {
 		f64 time_init;
 		f64 time_start;
 		f64 time_end;
+		u32 invoke_count = 0;
 	} stats;
 
 	struct Resources {
@@ -268,8 +272,8 @@ struct Request {
 		u64 fcgi_socket = 0;
 	} resources;
 
-	void invoke(String file_name);
+	//void invoke(String file_name);
-	void invoke(String file_name, DTree& call_param);
+	//void invoke(String file_name, DTree& call_param);
 
 	void ob_start();
 

src/linux_fastcgi.cpp

@@ -70,7 +70,7 @@ int handle_complete(FastCGIRequest& request) {
 	}
 
 	// printf("(i) request ready\n");
-    request.invoke(request.params["SCRIPT_FILENAME"]);
+    render_file(request.params["SCRIPT_FILENAME"]);
 
 	for( auto &f : request.uploaded_files)
 	{
@@ -87,6 +87,17 @@ int handle_complete(FastCGIRequest& request) {
 
 void listen_for_connections()
 {
+	if(precompile_jobs.size() > 0)
+	{
+		context = new Request();
+		context->server = &server_state;
+		for(auto s : precompile_jobs)
+		{
+			printf("- worker [%i] precompile %s\n", getpid(), s.c_str());
+			get_shared_unit(context, s, false);
+		}
+	}
+
 	signal(SIGSEGV, on_segfault);
 	server.on_request = &handle_request;
 	server.on_data = &handle_data;
@@ -106,6 +117,9 @@ void listen_for_connections()
 
 int main(int argc, char** argv)
 {
+	StringList precompile_jobs_pending;
+	u32 precompile_jobs_per_worker = 1;
+
 	printf("(P) Starting parent server PID:%i\n", getpid());
 
 	signal(SIGCHLD, on_child_exit);
@@ -143,11 +157,41 @@ int main(int argc, char** argv)
 	{
 		std::cout << e.what();
 	}*/
+	if(server_state.config.PRECOMPILE_FILES_IN != "" && server_state.config.WORKER_COUNT >= 2)
+	{
+		if(server_state.config.PRECOMPILE_FILES_IN != "/")
+			server_state.config.PRECOMPILE_FILES_IN = expand_path(server_state.config.PRECOMPILE_FILES_IN);
+		precompile_jobs_pending = split(trim(shell_exec(
+			"find " +
+			shell_escape(server_state.config.PRECOMPILE_FILES_IN) +
+			" -iname '*.uce' ")), "\n");
+		precompile_jobs_per_worker = 1 + (precompile_jobs_pending.size() / (server_state.config.WORKER_COUNT -1));
+		/*
+		*/
+	}
+
+	s32 worker_spawn_count = 0;
 
 	for(;;)
 	{
 		while(workers.size() < server_state.config.WORKER_COUNT)
 		{
+			worker_spawn_count++;
+			precompile_jobs.clear();
+			// spawn workers with precompile jobs if necessary but
+			// leave the first worker alone so it can start responding
+			// to requests right away
+			if(precompile_jobs_pending.size() > 0 && worker_spawn_count > 1)
+			{
+				for(u32 i = 0; i < precompile_jobs_per_worker; i++)
+				{
+					if(precompile_jobs_pending.size() > 0)
+					{
+						precompile_jobs.push_back(precompile_jobs_pending.back());
+						precompile_jobs_pending.pop_back();
+					}
+				}
+			}
 			spawn_subprocess(listen_for_connections);
 		}
 		sleep(1);

test/random.uce

@@ -20,8 +20,8 @@ RENDER()
 
 		for(auto i = 0; i < 100; i++)
 		{
-			print(i, ": ", (float)noise32(i)/(float)max_32, " / ", (float)noise64(i)/(float)max_64, " / ", noise01(i), " / ",
+			print(i, ": ", (float)gen_noise32(i)/(float)max_32, " / ", (float)gen_noise64(i)/(float)max_64, " / ", gen_noise01(i), " / ",
-				generate_int(0, 4, i), " / ", generate_float(0.0, 4.0, i), "\n");
+				gen_int(0, 4, i), " / ", gen_float(0.0, 4.0, i), "\n");
 		}
 
 		?></pre>
@@ -39,7 +39,7 @@ RENDER()
 		?></pre>
 
 		<div>
-		Sha1 of '1234': <?= sha1("1234") ?>
+		Sha1 of '1234': <?= gen_sha1("1234") ?>
 		</div>
 
 		Params

test/working-dir.uce

@@ -11,7 +11,7 @@ RENDER()
 		</h1>
 		<pre><?
 			print("Base WD: " + get_cwd() + "\n");
-			context->invoke("test2/working-dir-test.uce");
+			render_file("test2/working-dir-test.uce");
 		?></pre>
 		<pre><?= var_dump(context->params) ?></pre>
 	</>