hokusai-zero 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47573fc0ce1a9441f6f245e01d1fbabadb0304200bad43ad9335df021c2b192
-  data.tar.gz: 6d7ea6070947c4858d4c39f061394556cfd981f5c30bc59d0c84c632f9f30ada
+  metadata.gz: 85dc0be97bf2f9c770f53b45a7790bd5b1dbfda261fb0f0da4f71c6c2c9c67eb
+  data.tar.gz: eb62a84b75ba128fbcd6b052e97a95853a0379572be85ea5584c98117af84b61
 SHA512:
-  metadata.gz: e3c6601b81deae18295b0a942e1cecbf46e6cdf7c0a70b4ac86cbf5b362757e270188e7ac8090d0e4cc49391fe41701cb5bbfd93f83f4e0ff22cde94b6365236
-  data.tar.gz: 94d7ce2d8d856c7ad2f1f6e2ce8727cb0e5152655f6df1d5d4645f338f497af702a501c874fd21530d5fc9d0660e7643166712c48d1e8b7c1a3d7b9af51c46c4
+  metadata.gz: 1ac8520911b6ba9b3112c68d1f1f653b179b43678c320489a732c97462ba930b637545f018aadc190418be97a6b9fac725eae62dc133ec576e253e87ac518cc6
+  data.tar.gz: fad9fccafdca8cca5ad855dd69b6e7741bd251c39152fb04bdcf1a9027dc47acb59661b247eeb2dbbc32dae09c7c8c7b1273eb1c55afd35db62301477da4e7c5

data/Gemfile

@@ -5,11 +5,13 @@ gem "ffi", github: "ffi/ffi", submodules: true
 group :development, :test do
   gem "colorize"
   gem "concurrent-ruby", require: "concurrent"
-  gem "memory_profiler"
+  gem "memory_profiler", require: false
+  gem "mini_portile2", "~> 2.0.0" 
   gem "raylib-bindings"
   gem "rerun"
   gem "rest-client"
   gem "rspec"
   gem "sdl2-bindings"
   gem "thin", "1.8.0"
+  gem "yard", require: false
 end

data/Gemfile.lock

@@ -26,6 +26,7 @@ GEM
       logger
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.1203)
+    mini_portile2 (2.0.0)
     netrc (0.11.0)
     rack (2.2.10)
     raylib-bindings (0.7.9)
@@ -67,6 +68,7 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
+    yard (0.9.37)
 
 PLATFORMS
   aarch64-linux
@@ -80,12 +82,14 @@ DEPENDENCIES
   concurrent-ruby
   ffi!
   memory_profiler
+  mini_portile2 (~> 2.0.0)
   raylib-bindings
   rerun
   rest-client
   rspec
   sdl2-bindings
   thin (= 1.8.0)
+  yard
 
 BUNDLED WITH
    2.5.22

data/README.md

@@ -3,17 +3,19 @@
 A Ruby library for authoring GUI applications
 
 [![status-badge](https://ci.skinnyjames.net/api/badges/skinnyjames/hokusai/status.svg)](https://ci.skinnyjames.net/skinnyjames/hokusai)
+[![guides](https://img.shields.io/badge/guide-skinnyjames.net-black.svg)](https://hokusai.skinnyjames.net)
+[![docs](https://img.shields.io/badge/documentation-codeberg_pages-blue.svg)](https://skinnyjames.codeberg.page/hokusai/)
 [![license](https://img.shields.io/badge/license-peer_production-teal.svg)](https://wiki.p2pfoundation.net/Peer_Production_License)
 
 ## Getting started
 
-The build tooling of this project is [xmake](https://xmake.io/#/).  You will need it to compile dependencies and run demos.
-
-Hokusai contains a tree-sitter grammar to parse templates, and uses `md4c` to parse markdown.
+In your Gemfile
 
-When compiling the C portion of hokusai, tree-sitter will be statically linked.
+```ruby
+gem "hokusai-zero",  "0.1.4"
+```
 
-## In order to run an application, you will also need to install a backend
+## In order to run an application, you will need to install a backend
 
 ### Raylib
 
@@ -21,7 +23,7 @@ When compiling the C portion of hokusai, tree-sitter will be statically linked.
 * Write your app
 * Run app with `RAYLIB_PATH=/libpath/for/libraylib.(so|dylib) ruby <your app>.rb`
 
-### SDL
+### SDL2
 
 * Install the following deps
 
@@ -33,13 +35,6 @@ When compiling the C portion of hokusai, tree-sitter will be statically linked.
 * Write your app
 * Run app with `SDL_PATH=/libpath/for/libsdl.(so|dylib) ruby <your app>.rb`
 
-
-## Gemfile
-
-```ruby
-gem "hokusai-zero"
-```
-
 ## Example counter application
 
 ```ruby
@@ -47,86 +42,35 @@ require "hokusai"
 require "hokusai/backends/raylib"
 
 class Counter < Hokusai::Block
-  style <<~EOF
-  [style]
-  additionStyles {
-    background: rgb(214, 49, 24);
-    rounding: 0.0;
-    outline: outline(1,4,4,1);
-    outline_color: rgb(216, 26, 137);
-  }
-
-  additionLabel {
-    size: 40;
-    color: rgb(255,255,255);
-  }
-
-  subtractStyles {
-    background: rgb(0, 85, 170);
-    rounding: 0.0;
-  }
-
-  subtractLabel {
-    size: 50;
-    color: rgb(255,255,255);
-  }
-
-  scrollbar {
-    width: 25;
-    control_height: 100;
-    control_padding: 5;
-    control_rounding: 5;
-  }
-  EOF
-
   template <<-EOF
   [template]
-    hblock { @keypress="update_keys"}
-      vblock
-        hblock
-          label#count {
-            :content="count"
-            size="130" 
-            :color="count_color"
+    vblock
+      hblock
+        label {
+          :content="count"
+          size="130" 
+          :color="count_color"
+        }
+      hblock
+        vblock
+          label { 
+            content="Add"
+            @click="increment" 
+          }
+        vblock
+          label { 
+            content="Subtract"
+            @click="decrement" 
           }
-        hblock
-          vblock#add { ...additionStyles }
-            label { 
-              content="Add"
-              @click="increment" 
-              ...additionLabel 
-            }
-          vblock#subtract { ...subtractStyles }
-            label { 
-              content="Subtract"
-              @click="decrement" 
-              ...subtractLabel 
-            }
-      [if="count_positive"]
-        scrollbar { ...scrollbar }
   EOF
 
   uses(
     vblock: Hokusai::Blocks::Vblock,
     hblock: Hokusai::Blocks::Hblock,
     label: Hokusai::Blocks::Label,
-    scrollbar: Hokusai::Blocks::Scrollbar,
-    image: Hokusai::Blocks::Image
   )
 
-  attr_accessor :count, :keys
-
-  def count_positive
-    count > 0
-  end
-
-  def modal
-    !keys.empty?
-  end
-
-  def update_keys(event)
-    @keys << event.char
-  end
+  attr_accessor :count
 
   def increment(event)
     self.count += 1
@@ -142,7 +86,7 @@ class Counter < Hokusai::Block
 
   def initialize(**args)
     @count = 0
-    @keys = ""
+
     super(**args)
   end
 end
@@ -156,6 +100,12 @@ end
 
 ## Development
 
+The build tooling of this project is [xmake](https://xmake.io/#/).  You will need it to compile dependencies and run demos.
+
+Hokusai contains a tree-sitter grammar to parse templates, and uses `md4c` to parse markdown.
+
+When compiling the C portion of hokusai, tree-sitter will be statically linked.
+
 Requirements:
 * [xmake](https://xmake.io/#/) to build dependencies
 * Ruby to run applications

data/ast/src/core/hml.c

@@ -109,7 +109,7 @@ hoku_ast_func_call* hoku_ast_walk_func(TSNode node, char* template, int level)
 		{
 			if (init->args_len >= 9)
 			{
-				printf("maxed args!\n");
+				// printf("maxed args!\n");
 				break;
 			}
 			char* str = hoku_get_tag(arg, template);
@@ -456,17 +456,17 @@ hoku_style_attribute* hoku_walk_style_attributes(TSNode node, char* template)
 
 		if (function_name)
 		{
-			printf("setting func name!\n");
+			// printf("setting func name!\n");
 			attribute->function_name = strdup(function_name);
 			if (attribute->function_name == NULL) return NULL;
 			free(function_name);
-			printf("fter set func name\n");
+			// printf("fter set func name\n");
 		}
 
 		free(attribute_name);
 		free(value);
 
-		printf("after free!\n");
+		// printf("after free!\n");
 
 		if (top == NULL)
 		{
@@ -474,9 +474,9 @@ hoku_style_attribute* hoku_walk_style_attributes(TSNode node, char* template)
 		}
 		else
 		{
-			printf("append!\n %p, %p\n", top, attribute);
+			// printf("append!\n %p, %p\n", top, attribute);
 			hoku_style_attribute_append(top, attribute);
-			printf("after append\n");
+			// printf("after append\n");
 		}
 
 		attribute_node = ts_node_next_named_sibling(attribute_node);
@@ -501,9 +501,9 @@ hoku_style* hoku_walk_style_template(TSNode node, char* template)
 
 		TSNode style_children_node = ts_node_next_named_sibling(style_name_node);
 
-		printf("walking attributes!\n");
+		// printf("walking attributes!\n");
 		hoku_style_attribute* attributes = hoku_walk_style_attributes(style_children_node, template);
-		printf("after walk attributes!\n");
+		// printf("after walk attributes!\n");
 		if (attributes == NULL) return NULL;
 		style->attributes = attributes;
 
@@ -555,7 +555,7 @@ int hoku_style_from_template(hoku_style** out, char* template)
 
 	hoku_style* style = hoku_walk_style_template(templ, template);
 
-	printf("after walk style!\n");
+	// printf("after walk style!\n");
 	if (style == NULL)
 	{
 		ts_tree_delete(tree);

data/ast/src/core/text.c

@@ -3,6 +3,26 @@
 
 #include "text.h"
 
+#ifdef _WIN32
+size_t my_strnlen(const char* src, size_t n) {
+  size_t len = 0;
+  while (len < n && src[len]) len++;
+  return len;
+}
+
+char* strndup(const char* s, size_t n) {
+  size_t len = my_strnlen(s, n);
+  char* p = malloc(len + 1);
+  if (p) 
+  {
+    memcpy(p, s, len);
+    p[len] = '\0';
+  }
+
+  return p;
+}
+#endif
+
 int hoku_text_char_init(hoku_char** character, int offset, int width)
 {
   hoku_char* init = malloc(sizeof(hoku_char));
@@ -55,7 +75,7 @@ hoku_char* hoku_text_segment_split(hoku_segment* segment, int at)
   hoku_char* current_char = head->chars;
   if (at > head->size) return NULL;
 
-  printf("at: %d\n", at);
+  // printf("at: %d\n", at);
   int i = 0;
   for (i = 1; i < at; i++)
   {
@@ -692,8 +712,6 @@ int hoku_text_clamp(hoku_clamping** out, char* text, float width, float initial,
       // hard break on line
       else
       {
-       printf("easy branch %d\n", total_offset);
-
         // make a new segment
         hoku_segment* segment;
         if (hoku_text_segment_init(&segment, total_offset) != 0) return -1;

data/ast/test/text.c

@@ -30,7 +30,7 @@ TEST test_hoku_clamp_basic()
     for (d = 0; d < 2; d++)
     {
 
-      printf("[seg: %d] %d\n", i, d);
+      // printf("[seg: %d] %d\n", i, d);
       ASSERT_NEQ(NULL, chr);
       ASSERT_EQ_FMT(i * 2 + d, chr->offset, "%d");
       ASSERT_EQ_FMT(2, seg->size, "%d");
@@ -80,7 +80,7 @@ TEST test_hoku_clamp_file()
       // we can now close the file
       fclose(fh); fh = NULL;
 
-      printf("%s\n", buffer);
+      // printf("%s\n", buffer);
 
         hoku_clamping* clamp;
         int ret = hoku_text_clamp(&clamp, buffer, 400, 0.0, NULL, test_char_width_cb);
@@ -102,7 +102,7 @@ TEST test_hoku_clamp_markdown()
   hoku_clamping* clamp;
   int ret = hoku_text_md_clamp(&clamp, "hello _world_\nMy my **my**", 20, 0.0, NULL, test_char_width_cb);
   ASSERT_EQ_FMT(0, ret, "%d");
-  printf("clamp text: %s\n", clamp->text);
+  // printf("clamp text: %s\n", clamp->text);
   PASS();
 
 }

data/docs.sh

@@ -0,0 +1,29 @@
+#! /bin/bash
+
+build_directory="doc"
+build_branch="pages"
+
+# delete previous site built, if it exists
+if [ -d "$build_directory" ]; then
+  echo "Found previous site build, deleting it"
+  rm -rf $build_directory
+fi
+
+# get remote origin url, e.g. https://codeberg.org/user/repo.git
+remote_origin_url=$(git config --get remote.origin.url)
+
+# generate hugo static site to `build` directory
+bundle exec yardoc
+
+# initialize a git repo in build_directory and checkout to build_branch
+cd $build_directory
+git init
+git checkout -b $build_branch
+
+# stage all files except .gitignore (don't want it in the static site)
+git add -- . ':!.gitignore'
+
+# commit static site files and force push to build_branch of the origin
+git commit -m "build: update static site"
+git remote add origin $remote_origin_url
+git push --force origin $build_branch

data/ext/extconf.rb

@@ -1,29 +1,84 @@
 require "mkmf"
+require "mini_portile2"
+
+if MiniPortile.darwin?
+  suffix = "dylib"
+elsif MiniPortile.linux?
+  suffix = "so"
+elsif MiniPortile.windows?
+  suffix = "dll"
+else
+  raise "Currently only supporting darwin and linux"
+end
+
+tree_sitter = MiniPortile.new("libtree-sitter", "master", make_command: "make")
+tree_sitter.files = ["https://github.com/tree-sitter/tree-sitter/archive/refs/heads/master.zip"]
+tree_sitter.tap do |t|
+  if t.source_directory
+    t.prepare_build_directory
+  else
+    t.download unless t.downloaded?
+    t.extract
+    t.patch
+  end
+
+  def t.install
+    return if installed?
+
+    execute('install', %Q(#{make_cmd} all install CC=gcc AR=ar), { env: { "PREFIX" => File.expand_path(port_path) }})
+  end
+
+  t.install
+end
+
+tree_sitter.activate
+
+md4c = MiniPortileCMake.new("md4c", "0.5.2")
+md4c.files = ["https://github.com/mity/md4c/archive/refs/tags/release-0.5.2.zip"]
+
+def md4c.cmake_compile_flags
+  [*super, "-DBUILD_SHARED_LIBS=OFF"]
+end
+
+md4c.cook
+md4c.activate
+
+pre = "#{__dir__}/.."
+cwd = "#{__dir__}"
+
+files = %w[ast/src/core/hml.c ast/src/core/ast.c ast/rc/core/style.c ast/src/core/input.c ast/src/core/component.c ast/src/core/util.c ast/src/core/text.c grammar/src/parser.c grammar/src/scanner.c ast/include/hashmap.c]
+objects = %w[hml.o ast.o style.o input.o component.o util.o text.o parser.o scanner.o hashmap.o]
+libraries = ["#{tree_sitter.path}/lib/libtree-sitter.a", "#{md4c.path}/lib/libmd4c.a"]
+
+if MiniPortile.windows?
+  cflags = "-shared -Wall -Wl,--export-all-symbols -Wl,--enable-auto-import"
+  mkdir = "mkdir #{pre}\\vendor\\lib"
+else
+  cflags = "-shared -Wall"
+  mkdir = "mkdir -p #{pre}/vendor/lib"
+end
 
 File.open("Makefile", "w") do |io|
   io << <<~EOF
+  src_files = #{files.map {|file| "#{pre}/#{file}"}.join(" ")}
+  object_files = #{objects.map {|file| "#{cwd}/#{file}"}.join(" ")}
+  libraries = #{libraries.join(" ")}
+  src_files = #{tree_sitter.path}/lib/libtree-sitter.a #{md4c.path}/lib/libmd4c.a #{pre}/ast/src/core/hml.c #{pre}/ast/src/core/ast.c #{pre}/ast/src/core/style.c #{pre}/ast/src/core/input.c #{pre}/ast/src/core/component.c #{pre}/ast/src/core/util.c #{pre}/ast/src/core/text.c #{pre}/grammar/src/parser.c #{pre}/grammar/src/scanner.c #{pre}/ast/include/hashmap.c
+  includes = -I#{pre}/ast/include -I#{pre}/ast/src -I#{pre}/grammar/src -I#{tree_sitter.path}/include -I#{md4c.path}/include
   all: clean hokusai
+  
+  .PHONY: hokuasi
 
   install:
   #{"\t"}echo "done"
 
-  vendor/lib/libtree-sitter.a:
-  #{"\t"}xmake q -y hoku-tree-sitter
-
-  vendor/lib/libmd4c.a:
-  #{"\t"}xmake q -y hoku-md4c
-
-  hokusai: vendor/lib/libmd4c.a vendor/lib/libtree-sitter.a
-  #{"\t"}xmake b -y hokusai
+  hokusai:
+  #{"\t"}#{mkdir}
+  #{"\t"}gcc -c $(includes) $(src_files) $(libraries)
+  #{"\t"}gcc #{cflags} $(includes) -o #{pre}/vendor/lib/libhokusai.#{suffix} $(object_files) $(libraries)
 
   clean:
-  #{"\t"}xmake clean
-  #{"\t"}xmake q -y --uninstall hoku-tree-sitter
-  #{"\t"}xmake q -y --uninstall hoku-md4c
-  #{"\t"}xrepo clean -y hoku-tree-sitter
-  #{"\t"}xrepo clean -y hoku-md4c
   #{"\t"}rm -f vendor/lib/libhokusai.*
   #{"\t"}rm -f vendor/lib/libmd4c.*
-  #{"\t"}rm -f vendor/lib/libtree-sitter.*
   EOF
 end

data/grammar/corpus/1_document.txt

@@ -129,3 +129,27 @@ Attributes (Multiline)
               (name)
               (function
                 (name)))))))))
+
+==========
+Attributes (expressions)
+==========
+[template]
+  top
+    image {
+      :source="post.title"
+    }
+-----
+
+(document
+  (template
+    (element
+      (name)
+      (children
+        (element
+          (name)
+          (attributes
+            (prop
+              (computed)
+              (name)
+              (function
+                (name)))))))))

data/grammar/corpus/6_styles.txt

@@ -79,3 +79,26 @@ styleSpread {
           (style_func
             (function)
             (value)))))))
+
+========
+pathname
+========
+
+[style]
+ernestImage {
+  height: 80;
+  source: "assets/ernest.gif";
+}
+---------
+
+(document
+  (style_template
+    (style
+      (name)
+      (children
+        (element
+          (name)
+          (style_int))
+        (element
+          (name)
+          (style_string))))))

data/grammar/grammar.js

@@ -171,11 +171,11 @@ module.exports = grammar({
 			$._colon,
 			optional(/\s+/),
 			choice(
-				seq($._quote, alias($._method, $.style_string), $._quote),
 				$.style_float,
 				$.style_int,
 				$.style_bool,
-				$.style_func
+				$.style_func,
+				seq($._quote, alias($._any, $.style_string), $._quote),
 			),
 			$._semi,
 			optional(/\s*/)
@@ -250,11 +250,11 @@ module.exports = grammar({
 		_else_key: $ => "else",
 		_template_key: $ => "template",
 		_style_key: $ => "style",
-		_any: $ => /[A-Za-z0-9\,\_\-\=\*\&\^\%\.\$\#\s]*/,
+		_any: $ => /[^\"\n\;\(\)]+/,
 		_method: $ => /[A-Za-z][A-Za-z0-9\_]*/,
 		_word: $ => /[A-Za-z][A-Za-z0-9_-]*/,
 		_float: $ => /\d+\.\d+/,
-		_static_string: $ => /[A-Za-z0-9_\-,]*/,
+		_static_string: $ => /[A-Za-z0-9_\-,\.]*/,
 		_attributes_start: $ => / *\{/,
 		_attributes_end: $ => /\} */,
 		_macro_start: $ => "[",

data/grammar/src/grammar.json

@@ -799,6 +799,22 @@
         {
           "type": "CHOICE",
           "members": [
+            {
+              "type": "SYMBOL",
+              "name": "style_float"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "style_int"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "style_bool"
+            },
+            {
+              "type": "SYMBOL",
+              "name": "style_func"
+            },
             {
               "type": "SEQ",
               "members": [
@@ -810,7 +826,7 @@
                   "type": "ALIAS",
                   "content": {
                     "type": "SYMBOL",
-                    "name": "_method"
+                    "name": "_any"
                   },
                   "named": true,
                   "value": "style_string"
@@ -820,22 +836,6 @@
                   "name": "_quote"
                 }
               ]
-            },
-            {
-              "type": "SYMBOL",
-              "name": "style_float"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "style_int"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "style_bool"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "style_func"
             }
           ]
         },
@@ -1151,7 +1151,7 @@
     },
     "_any": {
       "type": "PATTERN",
-      "value": "[A-Za-z0-9\\,\\_\\-\\=\\*\\&\\^\\%\\.\\$\\#\\s]*"
+      "value": "[^\\\"\\n\\;\\(\\)]+"
     },
     "_method": {
       "type": "PATTERN",
@@ -1167,7 +1167,7 @@
     },
     "_static_string": {
       "type": "PATTERN",
-      "value": "[A-Za-z0-9_\\-,]*"
+      "value": "[A-Za-z0-9_\\-,\\.]*"
     },
     "_attributes_start": {
       "type": "PATTERN",