juicelang-theme 0.4.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c746809007ebaf03a3bf7b3d9c0351ab81e3720b76236cbbfc8098a4e20d2b97
-  data.tar.gz: 73f56175ee72e9e18f24173bbd1dc4cada95e1aa08d86e027720dc497fde0dcb
+  metadata.gz: 0f852df9e1751836546ec0ea84f1db906a60950456da13f4b9544a672a4fe784
+  data.tar.gz: c8885eb5faa5508b89a0b04dd6044a3f4d1f1af4739f3a1fe7956a0aa688f40c
 SHA512:
-  metadata.gz: 2d1de2220481122b1f90971b166492d5f9c5a28c3430765535c8f7e4b9fa2654ff2daa64f0eb166fff65dd79172e3c99139df76a8c5d046661c17d7289fdc530
-  data.tar.gz: 01e25c0a3100fd4763e76f404899b4cca4b575c7c26c69656f3ef9ff76ebffd4af0b45a7b85b0a24865c465ae522d83343d285ad5850edda25c7242ada249bd6
+  metadata.gz: 27994731614627460d4908dfc7accfa2e36e736b3050dc1128a92ade56104a6c7ffd3bc47c9adc228c82cc04bb2c9399e0844a410f7a21690e7e944f2d8fc6d1
+  data.tar.gz: d326873e94ae956149ca4b627fe7f17a37a5b7303fdeeb01cd213b7c3cd9cfe620d5adbc5103ec86e826e9860c06fe6e1903308a0a38c357048dbe053cbd2b81

data/_includes/nav.html

@@ -1,6 +1,6 @@
 <div id="{{ include.id }}" uk-offcanvas="mode: push{% if include.flip %}; flip: true{% endif %}">
     <div class="uk-offcanvas-bar">
-        <ul class="uk-nav-default" uk-nav='{"toggle": "> a.nav-parent-toggle"}''>
+        <ul class="uk-nav-default" uk-nav='{"toggle": "> a.nav-parent-toggle"}'>
             {% assign navigation = site.data.navigation[include.navigation] %}
             {% assign indexPage = site.pages | find: "path", navigation.index_path %}
             <li class="uk-nav-header"><a href="{{ indexPage | url_without_ext }}">{{ navigation.title }}</a></li>

data/lib/custom_tags.rb

@@ -4,8 +4,6 @@ require 'jekyll'
 require 'kramdown'
 require 'liquid'
 
-require_relative 'markdown_toc'
-
 
 class ToCTag < Liquid::Tag
     def initialize(tag_name, input, tokens)
@@ -15,22 +13,28 @@ class ToCTag < Liquid::Tag
     def render(context)
         toc = Kramdown::Document.new(context.registers[:page]['content'], {
             input: "GFM"
-        }).to_ToC
-        build_list(toc.select { |item| item[0] == 2 }, toc.first[1])
+        }).to_Toc
+        build_list(toc, context)
     end
 
     private
 
-    def build_list(toc, topLink)
-        result = '<li class="uk-active"><a href="#' + topLink + '">Top</a></li>' + "\n"
+    def build_list(toc, context)
+        top = toc.children.first.value
+        result = '<li class="uk-active"><a href="#' + top.attr['id'] + '">' + elementToHTML(top, context) + '</a></li>' + "\n"
 
-        for i in 0...toc.count
-            item = toc[i]
-            result += '<li><a href="#' + item[1] + '">' + item[2][0].value + "</a></li>\n"
+        for item in toc.children.first.children.map { |e| e.value }
+            result += '<li><a href="#' + item.attr['id'] + '">' + elementToHTML(item, context) + "</a></li>\n"
         end
 
         result
     end
+
+    def elementToHTML(el, context)
+        root = Kramdown::Element.new(:root, nil, nil, encoding: context.registers[:page]['content'].encoding)
+        root.children = el.children
+        Kramdown::Converter::CustomHtml.convert(root).first
+    end
 end
 
 Liquid::Template.register_tag('toc', ToCTag)

data/lib/juice_lexer.rb

@@ -14,7 +14,187 @@ Jekyll::Hooks.register :site, :pre_render do |site|
         filenames '*.juice'
 
         state :root do
-            rule %r/./m, Text
+            mixin :whitespace
+            mixin :keyword
+            mixin :operator
+            mixin :punctuation
+            mixin :identifier
+            mixin :literal
+        end
+
+        state :whitespace do
+            rule %r/[\x20\x0A\x0D\x09\x0B\x0C\x00]+/, Text::Whitespace
+            rule %r(//.*\n), Comment::Single
+            rule %r(/\*), Comment::Multiline, :multiline_comment
+        end
+
+        state :multiline_comment do
+            rule %r/(?:[^\*\/]|\*(?!\/)|\/(?!\*))+/, Comment::Multiline
+
+            rule %r(/\*), Comment::Multiline, :multiline_comment
+            rule %r(\*/), Comment::Multiline, :pop!
+        end
+
+        state :keyword do
+            rule %r/binary|enum|extension|func|import|init|internal|let|module|operator|private|precedencegroup|public|static|struct|subscript|throws|trait|type|typeprivate|var/, Keyword::Declaration
+            rule %r/break|case|catch|continue|default|defer|do|else|fallthrough|for|guard|if|in|loop|match|return|throw|where|while/, Keyword
+            rule %r/as|case|is|self|try/, Keyword
+            rule %r/any|some|throws|_/, Keyword::Type
+            rule %r/_/, Keyword
+            rule %r/above|associativity|below|binary|didSet|get|indirect|left|none|postfix|prefix|right|set|Type|value|willSet/, Keyword
+        end
+
+        state :operator do
+            rule %r/[+\-\*\/%<>=&\|\^!\?~]+/, Operator
+            rule %r/\.[+\-\*\/%<>=&\|\^!\?~\.]+/, Operator
+        end
+
+        state :punctuation do
+            rule %r/\(|\)|\[|\]|\{|\}|\.|,|:|;|=|&|->|=>|`|\?|!/, Punctuation
+        end
+
+        state :identifier do
+            rule %r/[_A-Za-z][_A-Za-z0-9]*/, Name
+            rule %r/`[_A-Za-z][_A-Za-z0-9]*`/, Name
+        end
+
+        state :literal do
+            rule %r/true|false|nil/, Keyword::Constant
+            rule %r/'/, Str::Delimiter, :character_literal
+
+            rule %r/(#*)"""/ do |m|
+                token Str::Delimiter
+                @multiline = true
+                @rawLevel = m[1].length
+                push :string_literal
+            end
+
+            rule %r/(#*)"/ do |m|
+                token Str::Delimiter
+                @multiline = false
+                @rawLevel = m[1].length
+                push :string_literal
+            end
+
+            rule %r/[0-9][0-9_]*(?:\.[0-9][0-9_]*(?:[eE][+-]?[0-9][0-9_]*)?|[eE][+-]?[0-9][0-9_]*)/, Num::Float
+            rule %r/[0-9][0-9_]*/, Num::Integer
+            rule %r/0b[01][01_]*/, Num::Bin
+            rule %r/0o[0-7][0-7_]*/, Num::Oct
+            rule %r/0x[0-9a-fA-F][0-9a-fA-F_]*/, Num::Hex
+        end
+
+        state :character_literal do
+            rule %r/[^\\']/ do
+                token Str::Char
+                goto :character_literal_ending
+            end
+
+            rule %r/\\/ do
+                token Str::Escape
+                goto :character_literal_ending
+                push :escape
+            end
+        end
+
+        state :character_literal_ending do
+            rule %r/'/, Str::Delimiter, :pop!
+        end
+
+        state :string_literal do
+            rule %r/[^\\"\$]+/, Str
+            rule %r/"""/ do
+                if @multiline
+                    if @rawLevel > 0
+                        @delimiter = '"""'
+                        @currentRawLevel = @rawLevel
+                        goto :raw_string_literal_ending
+                    else
+                        token Str::Delimiter
+                        pop!
+                    end
+                else
+                    token Error
+                    pop!
+                end
+            end
+
+            rule %r/"/ do
+                if !@multiline
+                    if @rawLevel > 0
+                        @delimiter = '"'
+                        @currentRawLevel = @rawLevel
+                        goto :raw_string_literal_ending
+                    else
+                        token Str::Delimiter
+                        pop!
+                    end
+                else
+                    token Str
+                end
+            end
+
+            rule %r/\\?\n/ do
+                if @multiline
+                    token Str
+                else
+                    token Error
+                    pop!
+                end
+            end
+
+            rule %r/(\\)(#*)/ do |m|
+                if m[2].length < @rawLevel
+                    token Str
+                elsif m[2].length == @rawLevel
+                    token Str::Escape
+                    push :escape
+                else
+                    token Error
+                end
+            end
+
+            rule %r/\$\{/, Str::Interpol, :interpolation
+        end
+
+        state :raw_string_literal_ending do
+            rule %r/#/ do
+                @delimiter += '#'
+
+                if @currentRawLevel > 1
+                    @currentRawLevel -= 1
+                else
+                    token Str::Delimiter, @delimiter
+                    pop!
+                end
+            end
+
+            rule %r/[^#]/ do
+                token Str, @delimiter
+                token Str
+                goto :string_literal
+            end
+
+            rule %r/\n/ do
+                if @multiline
+                    token Str, @delimiter
+                    token Str
+                    goto :string_literal
+                else
+                    token Error
+                    pop!
+                end
+            end
+        end
+
+        state :interpolation do # TODO
+            rule %r/[^\{\}]+/, Str::Interpol
+            rule %r/\{/, Str::Interpol, :interpolation
+            rule %r/\}/, Str::Interpol, :pop!
+        end
+
+        state :escape do
+            rule %r/0|\\|t|n|r|"|'|\$/, Str::Escape, :pop!
+            rule %r/u\{[0-9a-fA-F]{1,8}\}/, Str::Escape, :pop!
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: juicelang-theme
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.1
 platform: ruby
 authors:
 - Josef Zoller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-03 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -275,7 +275,6 @@ files:
 - lib/juice_lexer.rb
 - lib/juicelang-theme.rb
 - lib/markdown.rb
-- lib/markdown_toc.rb
 homepage: https://github.com/juice-lang/juicelang-theme
 licenses:
 - MIT

data/lib/markdown_toc.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'jekyll'
-require 'kramdown'
-
-class Kramdown::Converter::ToC < Kramdown::Converter::Html
-    def convert(el, indent = -@indent)
-        result = super
-        return result unless el.type == :root
-
-        @toc
-    end
-end