rpl 0.16.2 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ffc36b2560d0b7a6396c32d769c95a9d108fea01b9c58b32e2e7f401f2265f
-  data.tar.gz: ba04b5b645003dff6bb73b9d561c0b3818aff12e12756a30958c3a72c4639a50
+  metadata.gz: 9503bcb52c319c657b082e69d395d55afc2bd2d0426d6fd58a488296dfb401fe
+  data.tar.gz: 01cf9eece63336abf8ce25c27faae3bffc67e678cc2267eaf6c91e9ba4302053
 SHA512:
-  metadata.gz: 63fa59fa82bc0cb40d4dd3d17965721491c586e4a81ab775f78156c266603f231c26472bba75242a4314c551158c614cff1bebd94fa50e478a6f63e5fd9a44c0
-  data.tar.gz: 7212eb69e7631bd4ff6ce27b7e4833a98c1a8c33bb14a712773c39b46533aee71fb7a59b3915ceff8dce733ba8a44db9a6109acac82b6be944beb1b84927ad6a
+  metadata.gz: 7b47ac5a4038fc602f7cb1ee3b279d6bdb9df8321ccf92be432324928c016c53e01f6886176902763193a0a120a41d2d9887845cd6692aa27e348a8fd82d0b04
+  data.tar.gz: 8995e27122d1223676bb2dc060079b8c6f07c8dad03ac288394b9b5fedfd54f8a324224a0c7fcd52dc30513db099964d954c2cfcf6961cdbbe49c11633420734

data/bin/rpl

@@ -60,6 +60,8 @@ class RplRepl
         end
       end
 
+      print_lcd if @interpreter.show_lcd
+
       print_stack
     rescue Interrupt
       puts '^C'
@@ -68,6 +70,10 @@ class RplRepl
     end
   end
 
+  def print_lcd
+    puts @interpreter.lcd_grob.to_braille
+  end
+
   def print_stack
     stack_size = @interpreter.stack.size
 

data/lib/rpl/interpreter.rb

@@ -7,44 +7,24 @@ require 'bigdecimal/util'
 require 'rpl/dictionary'
 require 'rpl/types'
 
-class BitArray
-  def initialize
-    @mask = 0
-  end
-
-  def []=(position, value)
-    if value.zero?
-      @mask ^= (1 << position)
-    else
-      @mask |= (1 << position)
-    end
-  end
-
-  def [](position)
-    @mask[position]
-  end
-end
-
 class Interpreter
   include BigMath
   include Types
 
   attr_reader :stack,
-              :frame_buffer,
+              :lcd_grob,
               :dictionary,
               :version
 
-  attr_accessor :precision
+  attr_accessor :show_lcd
 
   def initialize( stack: [], dictionary: Dictionary.new )
     @dictionary = dictionary
     @stack = stack
 
-    initialize_frame_buffer
-  end
+    @show_lcd = false
 
-  def initialize_frame_buffer
-    @frame_buffer = BitArray.new
+    @lcd_grob = RplGrOb.new( 'GROB:131:64:0' )
   end
 
   def run!( input )
@@ -97,6 +77,13 @@ class Interpreter
     args
   end
 
+  def export_lcd
+    lcd_as_string = "@ LCD:\n"
+    lcd_as_string += "#{@lcd_grob} →lcd\n"
+
+    lcd_as_string
+  end
+
   def export_vars
     vars_as_string = "@ variables:\n"
     vars_as_string += @dictionary.vars

data/lib/rpl/parser.rb

@@ -103,6 +103,8 @@ class Parser
         Types.new_object( RplString, element )
       elsif RplProgram.can_parse?( element )
         Types.new_object( RplProgram, element )
+      elsif RplGrOb.can_parse?( element )
+        Types.new_object( RplGrOb, element )
       elsif RplName.can_parse?( element )
         Types.new_object( RplName, element )
       end

data/lib/rpl/types/grob.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'drawille'
+
+require 'rpl/parser'
+
+class BitArray
+  def initialize
+    @mask = 0
+  end
+
+  def []=(position, value)
+    if value.zero?
+      @mask &= ~(1 << position)
+    else
+      @mask |= (1 << position)
+    end
+  end
+
+  def [](position)
+    @mask[position]
+  end
+
+  def to_i
+    @mask.to_i
+  end
+
+  def from_i( value )
+    @mask = value.to_i
+  end
+end
+
+module Types
+  class RplGrOb
+    attr_accessor :width,
+                  :height,
+                  :bits
+
+    def initialize( init )
+      raise RplTypeError unless self.class.can_parse?( init )
+
+      parsed = if init.instance_of?( RplGrOb )
+                 init.value
+               else
+                 /^GROB:(?<width>\d+):(?<height>\d+):(?<bits>[0-9a-f]+)$/.match( init )
+               end
+
+      @width = parsed[:width].to_i
+      @height = parsed[:height].to_i
+      @bits = BitArray.new
+      @bits.from_i( parsed[:bits].to_i( 16 ) )
+    end
+
+    def value
+      { width: @width,
+        height: @height,
+        bits: @bits.to_i.to_s( 16 ) }
+    end
+
+    def to_s
+      "GROB:#{@width}:#{@height}:#{@bits.to_i.to_s( 16 )}"
+    end
+
+    def self.can_parse?( value )
+      value.instance_of?( RplGrOb ) ||
+        ( value.instance_of?( String ) && value.match?(/^GROB:\d+:\d+:[0-9a-f]+$/) )
+    end
+
+    def ==( other )
+      other.class == RplGrOb &&
+        other.width == @width &&
+        other.height == @height &&
+        other.bits.to_i == @bits.to_i
+    end
+
+    def to_text
+      @bits.to_i
+           .to_s(2)
+           .ljust(@width * @height, '0')
+           .slice(0, @width * @height)
+           .scan(/.{1,#{@width}}/)
+           .join("\n")
+           .gsub( '0', '_' )
+           .gsub( '1', '.' )
+    end
+
+    def to_braille
+      canvas = Drawille::Canvas.new
+
+      @height.times do |y|
+        @width.times do |x|
+          canvas[x, y] = @bits[ ( y * @width ) + x ] == 1
+        end
+      end
+
+      canvas.frame
+    end
+
+    def get_pixel( pos_x, pos_y )
+      @bits[ ( pos_y * @width ) + pos_x ]
+    end
+
+    def set_pixel( pos_x, pos_y, value )
+      @bits[ ( pos_y * @width ) + pos_x ] = value.to_i.zero? ? 0 : 1
+    end
+
+    def clear
+      @bits.from_i( 0 )
+    end
+  end
+end

data/lib/rpl/types.rb

@@ -7,6 +7,7 @@ require 'rpl/types/string'
 require 'rpl/types/program'
 require 'rpl/types/numeric'
 require 'rpl/types/complex'
+require 'rpl/types/grob'
 
 module Types
   module_function

data/lib/rpl/words/graphics.rb

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module RplLang
+  module Words
+    module Graphics
+      include Types
+
+      def populate_dictionary
+        super
+
+        category = 'GrOb (Graphic Objects)'
+
+        @dictionary.add_word!( ['→grob', '->grob'],
+                               category,
+                               '( w h d -- g ) make a GrOb from 3 numerics: width, height, data',
+                               proc do
+                                 args = stack_extract( [[RplNumeric], [RplNumeric], [RplNumeric]] )
+
+                                 @stack << RplGrOb.new( "GROB:#{args[2].value.to_i}:#{args[1].value.to_i}:#{args[0].value.to_i.to_s( 16 )}" )
+                               end )
+        @dictionary.add_word!( ['grob→', 'grob->'],
+                               category,
+                               '( g -- w h d ) split a GrOb into its 3 basic numerics',
+                               proc do
+                                 args = stack_extract( [[RplGrOb]] )
+
+                                 @stack << RplNumeric.new( args[0].width )
+                                 @stack << RplNumeric.new( args[0].height )
+                                 @stack << RplNumeric.new( args[0].bits, 16 )
+                               end )
+        @dictionary.add_word!( ['blank'],
+                               category,
+                               '( w h -- g ) create an empty GrOb',
+                               proc do
+                                 args = stack_extract( [[RplNumeric], [RplNumeric]] )
+
+                                 w = args[1].value.to_i
+                                 h = args[0].value.to_i
+
+                                 @stack << RplGrOb.new( "GROB:#{w}:#{h}:0" )
+                               end )
+
+        category = 'Lcd management and manipulation'
+
+        @dictionary.add_word!( ['lcdon'],
+                               category,
+                               '( -- ) display lcd',
+                               proc do
+                                 @show_lcd = true
+                               end )
+        @dictionary.add_word!( ['lcdoff'],
+                               category,
+                               '( -- ) hide lcd',
+                               proc do
+                                 @show_lcd = false
+                               end )
+
+        @dictionary.add_word!( ['lcdwidth'],
+                               category,
+                               '( -- i ) put framebuffer\'s width on stack',
+                               proc do
+                                 @stack << RplNumeric.new( @lcd_grob.width )
+                               end )
+        @dictionary.add_word!( ['lcdheight'],
+                               category,
+                               '( -- i ) put framebuffer\'s height on stack',
+                               proc do
+                                 @stack << RplNumeric.new( @lcd_grob.height )
+                               end )
+
+        @dictionary.add_word!( ['→lcdwidth', '->lcdwidth'],
+                               category,
+                               '( i -- ) set framebuffer\'s width',
+                               proc do
+                                 args = stack_extract( [[RplNumeric]] )
+
+                                 @lcd_grob.width = args[0].value.to_i
+                               end )
+        @dictionary.add_word!( ['→lcdheight', '->lcdheight'],
+                               category,
+                               '( i -- ) set framebuffer\'s height',
+                               proc do
+                                 args = stack_extract( [[RplNumeric]] )
+
+                                 @lcd_grob.height = args[0].value.to_i
+                               end )
+
+        @dictionary.add_word!( ['lcd→', 'lcd->'],
+                               category,
+                               '( -- g ) export framebuffer to GrOb',
+                               proc do
+                                 @stack << RplGrOb.new( @lcd_grob )
+                               end )
+        @dictionary.add_word!( ['→lcd', '->lcd'],
+                               category,
+                               '( g -- ) import GrOb into framebuffer',
+                               proc do
+                                 args = stack_extract( [[RplGrOb]] )
+
+                                 @lcd_grob = RplGrOb.new( args[0] )
+                               end )
+
+        # Pixel manipulation
+        @dictionary.add_word!( ['pixon'],
+                               category,
+                               '( x y -- ) turn on pixel at x y coordinates',
+                               proc do
+                                 args = stack_extract( [[RplNumeric], [RplNumeric]] )
+
+                                 x = args[1].value.to_i
+                                 y = args[0].value.to_i
+
+                                 @lcd_grob.set_pixel(x, y, 1)
+                               end )
+        @dictionary.add_word!( ['pixoff'],
+                               category,
+                               '( x y -- ) turn off pixel at x y coordinates',
+                               proc do
+                                 args = stack_extract( [[RplNumeric], [RplNumeric]] )
+
+                                 x = args[1].value.to_i
+                                 y = args[0].value.to_i
+
+                                 @lcd_grob.set_pixel(x, y, 0)
+                               end )
+        @dictionary.add_word!( ['pix?'],
+                               category,
+                               '( x y -- b ) return boolean state of pixel at x y coordinates',
+                               proc do
+                                 args = stack_extract( [[RplNumeric], [RplNumeric]] )
+
+                                 x = args[1].value.to_i
+                                 y = args[0].value.to_i
+
+                                 @stack << RplBoolean.new( @lcd_grob.get_pixel(x, y) == 1 )
+                               end )
+      end
+    end
+  end
+end

data/lib/rpl/words/repl.rb

@@ -79,6 +79,14 @@ module RplLang
                                category,
                                '() print internal state of local variables layers',
                                proc { pp @dictionary.local_vars_layers } )
+
+        @dictionary.add_word!( ['.fb'],
+                               category,
+                               '() print internal state of framebuffer',
+                               proc do
+                                 pp @show_display
+                                 pp @framebuffer
+                               end )
       end
     end
   end

data/lib/rpl/words.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rpl/words/branch'
-require 'rpl/words/display'
 require 'rpl/words/general'
 require 'rpl/words/mode'
 require 'rpl/words/operations-reals'
@@ -19,3 +18,4 @@ require 'rpl/words/trig'
 require 'rpl/words/logarithm'
 require 'rpl/words/filesystem'
 require 'rpl/words/list'
+require 'rpl/words/graphics'

data/lib/rpl.rb

@@ -5,7 +5,7 @@ require 'rpl/types'
 require 'rpl/words'
 
 class Rpl < Interpreter
-  VERSION = '0.16.2'
+  VERSION = '0.17.1'
 
   include Types
 
@@ -37,7 +37,7 @@ class Rpl < Interpreter
   def persist_state
     return if @persistence_filename.nil?
 
-    File.write(@persistence_filename, "#{export_vars}\n#{export_stack}")
+    File.write(@persistence_filename, "#{export_lcd}\n#{export_vars}\n#{export_stack}")
   end
 
   def run!( input )
@@ -49,9 +49,9 @@ class Rpl < Interpreter
   end
 
   prepend RplLang::Words::Branch
-  prepend RplLang::Words::Display
   prepend RplLang::Words::FileSystem
   prepend RplLang::Words::General
+  prepend RplLang::Words::Graphics
   prepend RplLang::Words::List
   prepend RplLang::Words::Logarithm
   prepend RplLang::Words::Mode

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rpl
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.1
 platform: ruby
 authors:
 - Gwenhael Le Moine
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-06 00:00:00.000000000 Z
-dependencies: []
+date: 2023-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: drawille
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.3
 description: Reverse-Polish-Lisp inspired language in ruby
 email: gwenhael@le-moine.org
 executables:
@@ -27,6 +41,7 @@ files:
 - lib/rpl/types.rb
 - lib/rpl/types/boolean.rb
 - lib/rpl/types/complex.rb
+- lib/rpl/types/grob.rb
 - lib/rpl/types/list.rb
 - lib/rpl/types/name.rb
 - lib/rpl/types/numeric.rb
@@ -34,9 +49,9 @@ files:
 - lib/rpl/types/string.rb
 - lib/rpl/words.rb
 - lib/rpl/words/branch.rb
-- lib/rpl/words/display.rb
 - lib/rpl/words/filesystem.rb
 - lib/rpl/words/general.rb
+- lib/rpl/words/graphics.rb
 - lib/rpl/words/list.rb
 - lib/rpl/words/logarithm.rb
 - lib/rpl/words/mode.rb
@@ -72,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.17
 signing_key:
 specification_version: 4
 summary: Functional Stack Language

data/lib/rpl/words/display.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module RplLang
-  module Words
-    module Display
-      include Types
-
-      def populate_dictionary
-        super
-
-        category = 'Display'
-
-        @dictionary.add_word!( ['erase'],
-                               category,
-                               '( -- ) erase display',
-                               proc do
-                                 initialize_frame_buffer
-                               end )
-
-        @dictionary.add_word!( ['display→', 'display->'],
-                               category,
-                               '( -- pict ) put current display state on stack',
-                               proc do
-                                 @stack << @frame_buffer # FIXME: RplPict type
-                               end )
-      end
-    end
-  end
-end