bitclust-core 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e32c5dfdf60ae79984fb44940fa5125727de9823b97d57f4476ff17381f71fe
-  data.tar.gz: c6e37cad779f2876ae2ad907b7e0d04ad21a2cfd622c68089edcb2995788a723
+  metadata.gz: b69f11fbdf0bc331f213ef6d9d854c39d96920492d182277101106d1ed0de062
+  data.tar.gz: 53858c49735d3b7207292a5d704c015209226f4a39a7763ccd031919e34225c9
 SHA512:
-  metadata.gz: 5fdb5e20b6d1469f314e2abb08e5082169a340e49679f22e5d89195d595b66791e2e2adad946946c56c487fa7491aaacc4b75eeae5394621858011e9f46eaded
-  data.tar.gz: 86042f89cc75d2cca54cef4c6622bcadd05987bb9a3ff0ef7bd2a7a7ec3f3320f41b40ca2c10c9c7e2984684c8afcf1eaa5ef29dff19c1a120077bf84556bd45
+  metadata.gz: 04b3303a69a3ee1610ed17c5124f81280cf68355973b1726f3a474e8a22c096329ed82dc687237e3d6c6b19a13e0d6ddcda33f457cb81d7e4ebb22929ba76c1b
+  data.tar.gz: 42c05365d2c6985e3fe147942c70672463a77e31e46cbc407c3044c3a73e72a36cbcfa0f68ba5bce5a89d516ad1edd4865e79f009cae1113f583450f1f79d99c

data/data/bitclust/template.epub/method

@@ -14,8 +14,14 @@
 <% headline_init %>
 <%= headline("#{entry.type_label} #{entry.label}") %>
 <dl class="methodlist">
-<% @entries.sort.each do |ent| %>
+<%
+    headline_push
+    @entries.sort.each do |ent|
+%>
 <%= compile_method(ent) %>
-<% end %>
+<%
+    end
+    headline_pop
+%>
 </dl>
 

data/data/bitclust/template.lillia/method

@@ -15,7 +15,13 @@
 <% headline_init %>
 <%= headline("#{entry.type_label} #{entry.label}") %>
 <dl class="methodlist">
-<% @entries.sort.each do |ent| %>
+<%
+    headline_push
+    @entries.sort.each do |ent|
+%>
 <%= compile_method(ent) %>
-<% end %>
+<%
+    end
+    headline_pop
+%>
 </dl>

data/data/bitclust/template.offline/method

@@ -15,8 +15,14 @@
 <% headline_init %>
 <%= headline("#{entry.type_label} #{entry.label}") %>
 <dl class="methodlist">
-<% @entries.sort.each do |ent| %>
+<%
+    headline_push
+    @entries.sort.each do |ent|
+%>
 <%= compile_method(ent) %>
-<% end %>
+<%
+    end
+    headline_pop
+%>
 </dl>
 

data/lib/bitclust/lineinput.rb

@@ -17,8 +17,9 @@ class LineInput
     new(StringIO.new(s))
   end
 
-  def initialize(f)
+  def initialize(f, entry = nil)
     @input = f
+    @entry = entry
     @buf = []
     @lineno = 0
     @eof_p = false
@@ -36,6 +37,14 @@ class LineInput
     @input.path
   end
 
+  def name
+    if @entry
+      @entry.inspect
+    else
+      "-"
+    end
+  end
+
   def lineno
     @lineno
   end

data/lib/bitclust/rdcompiler.rb

@@ -45,7 +45,7 @@ module BitClust
     def compile_function(f, opt = nil)
       @opt = opt
       @type = :function
-      setup(f.source) {
+      setup(f.source, f) {
         entry
       }
     ensure
@@ -57,7 +57,7 @@ module BitClust
       @opt = opt
       @type = :method
       @method = m
-      setup(m.source) {
+      setup(m.source, m) {
         entry
       }
     ensure
@@ -66,8 +66,8 @@ module BitClust
 
     private
 
-    def setup(src)
-      @f = LineInput.new(StringIO.new(src))
+    def setup(src, entry = nil)
+      @f = LineInput.new(StringIO.new(src), entry)
       @out = StringIO.new
       yield
       @out.string
@@ -275,7 +275,13 @@ module BitClust
           src << line
         end
         if lang == "ruby"
-          string BitClust::SyntaxHighlighter.new(src).highlight
+          begin
+            filename = (caption&.size || 0) > 2 ? caption : @f.name
+            string BitClust::SyntaxHighlighter.new(src, filename).highlight
+          rescue BitClust::SyntaxHighlighter::Error => ex
+            $stderr.puts ex.message
+            exit(false)
+          end
         else
           string src
         end

data/lib/bitclust/syntax_highlighter.rb

@@ -5,6 +5,25 @@ module BitClust
   class SyntaxHighlighter < Ripper::Filter
     include BitClust::HTMLUtils
 
+    class Error < StandardError
+      def initialize(name, lineno, column, error_message)
+        @name = name
+        @lineno = lineno
+        @column = column
+        @error_message = error_message
+      end
+
+      def message
+        "#{@name}:#{@lineno}:#{@column} #{@error_message} (#{self.class})"
+      end
+    end
+
+    class ParseError < Error
+    end
+
+    class CompileError < Error
+    end
+
     COLORS = {
       CHAR: "sc",                      # ?a
       __end__: "k",                    # __END__
@@ -97,10 +116,16 @@ module BitClust
 
     BUILTINS_B = %w[chomp chop exit gsub sub]
 
-    def initialize(*args)
+    def initialize(src, filename = "-", lineno = 1)
       super
       @stack = []
       @name_buffer = []
+      @__lexer.define_singleton_method(:on_parse_error) do |message|
+        raise ParseError.new(filename, self.lineno, self.column, message)
+      end
+      @__lexer.define_singleton_method(:compile_error) do |message|
+        raise CompileError.new(filename, self.lineno, self.column, message)
+      end
     end
 
     def on_default(event, token, data)

data/lib/bitclust/version.rb

@@ -1,3 +1,3 @@
 module BitClust
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/test_syntax_highlighter.rb

@@ -0,0 +1,23 @@
+require 'bitclust/syntax_highlighter'
+
+class TestSyntaxHighlighter < Test::Unit::TestCase
+  def highlight(src, filename = "-")
+    BitClust::SyntaxHighlighter.new(src, filename).highlight
+  end
+
+  sub_test_case "syntax error" do
+    test "single line" do
+      src = "...\n"
+      assert_raise(BitClust::SyntaxHighlighter::ParseError.new("-", 1, 3, "syntax error, unexpected ...")) do
+        highlight(src)
+      end
+    end
+
+    test "multiple line" do
+      src = "a = 1\n...\n"
+      assert_raise(BitClust::SyntaxHighlighter::ParseError.new("-", 2, 3, "syntax error, unexpected ..., expecting end-of-input")) do
+        highlight(src)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitclust-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - https://github.com/rurema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -191,7 +191,6 @@ files:
 - lib/bitclust/subcommands/preproc_command.rb
 - lib/bitclust/subcommands/property_command.rb
 - lib/bitclust/subcommands/query_command.rb
-- lib/bitclust/subcommands/review_command.rb
 - lib/bitclust/subcommands/server_command.rb
 - lib/bitclust/subcommands/setup_command.rb
 - lib/bitclust/subcommands/statichtml_command.rb
@@ -214,6 +213,7 @@ files:
 - test/test_rrdparser.rb
 - test/test_runner.rb
 - test/test_simplesearcher.rb
+- test/test_syntax_highlighter.rb
 - theme/default/images/external.png
 - theme/default/rurema.png
 - theme/default/style.css
@@ -241,23 +241,24 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: BitClust is a rurema document processor.
 test_files:
-- test/test_simplesearcher.rb
-- test/test_refsdatabase.rb
-- test/test_runner.rb
 - test/test_methoddatabase.rb
-- test/test_nameutils.rb
-- test/run_test.rb
-- test/test_rrdparser.rb
+- test/test_functiondatabase.rb
+- test/test_refsdatabase.rb
 - test/test_bitclust.rb
 - test/test_methodsignature.rb
-- test/test_entry.rb
 - test/test_functionreferenceparser.rb
-- test/test_rdcompiler.rb
+- test/test_simplesearcher.rb
 - test/test_preprocessor.rb
-- test/test_functiondatabase.rb
+- test/test_runner.rb
 - test/test_libraryentry.rb
+- test/test_nameutils.rb
+- test/test_entry.rb
+- test/run_test.rb
+- test/test_rdcompiler.rb
+- test/test_rrdparser.rb
+- test/test_syntax_highlighter.rb

data/lib/bitclust/subcommands/review_command.rb

@@ -1,9 +0,0 @@
-
-module BitClust
-  module Subcommands
-    class ReviewCommand < Subcommand
-      include NameUtils
-      
-    end
-  end
-end