oppen 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a496d964de133aa177270080b9444d8e9ef865ce1b355bef4a6c4a43462d48c
-  data.tar.gz: d2955b0983ef133fd374c1c46fc3424d9cff05c4ec910a6ca5ad94ec3f2db78d
+  metadata.gz: 81c1832fc106f4f4622738ad55ea231c66bdb40a96523d9913b3426781aed296
+  data.tar.gz: 9c5797979a36d529317bf31cdc85a158309c26f5a0c298f8cd1e577a83f4386a
 SHA512:
-  metadata.gz: d4319e6b5be2d8fa394cf8d6cd593c4e8ab0b5c1c0a313cc42e287a93b46e23a95d844b8bddd01e5547ac67faa4b04395d5edb5ae911380572a0df1b7acf0c95
-  data.tar.gz: 680e57e6f38f4cda980b57d04e787b4b33becc7b45de4c73810b243e82169411d62cd0d34b56a67df3e96debcc6d8a2ad777046aedec342429792fc91f3b3346
+  metadata.gz: e6a37e27b916fc83323a4b4b387c3990265094ac0c326b5770328ce8d43977b421c8cc0b2092b3c8a877d619ee56578abee1c0f5b2af9390c12f696211eb6446
+  data.tar.gz: 2548a7c7cd71299b8779714537916cf603f72a57bf2d02cf0ebcad163bafe7d53299e833cae07ada8a8cc30ddf2ba4e7ef19df6556656c2c920a90478c734ce4

data/lib/oppen/print_stack.rb

@@ -33,15 +33,15 @@ module Oppen
     # Delimiter between lines in output
     attr_reader :new_line
 
-    # Page margin (Called length in the original paper).
-    attr_reader :margin
+    # Maximum allowed width for printing (Called length in the original paper).
+    attr_reader :width
 
     # Current available space (Called index in the original paper).
     #
     # @return [Integer] Current available space (Called index in the original paper).
     attr_reader :space
 
-    def initialize(margin, new_line, config, space, out)
+    def initialize(width, new_line, config, space, out)
       @buffer = out
       @config = config
       @genspace =
@@ -55,8 +55,8 @@ module Oppen
         end
       @items = []
       @new_line = new_line
-      @margin = margin
-      @space = margin
+      @width = width
+      @space = width
     end
 
     # Returns the output of the print stack
@@ -71,32 +71,32 @@ module Oppen
     # @note Called Print in the original paper.
     #
     # @param token [Token]
-    # @param token_length [Integer]
+    # @param token_width [Integer]
     #
     # @return [Nil]
-    def print(token, token_length)
+    def print(token, token_width)
       case token
       in Token::Begin
-        handle_begin token, token_length
+        handle_begin token, token_width
       in Token::End
         handle_end
       in Token::Break
-        handle_break token, token_length
+        handle_break token, token_width
       in Token::String
-        handle_string token, token_length
+        handle_string token, token_width
       end
     end
 
     # Handle Begin Token.
     #
     # @param token [Token]
-    # @param token_length [Integer]
+    # @param token_width [Integer]
     #
     # @return [Nil]
     #
     # @see Token::Begin
-    def handle_begin(token, token_length)
-      if token_length > space
+    def handle_begin(token, token_width)
+      if token_width > space
         type =
           if token.break_type == Token::BreakType::CONSISTENT
             Token::BreakType::CONSISTENT
@@ -129,16 +129,16 @@ module Oppen
     # Handle Break Token.
     #
     # @param token [Token]
-    # @param token_length [Integer]
+    # @param token_width [Integer]
     #
     # @return [Nil]
     #
     # @see Token::Break
-    def handle_break(token, token_length)
+    def handle_break(token, token_width)
       block = top
       case block.break_type
       in Token::BreakType::FITS
-        @space -= token.length
+        @space -= token.width
         write token
       in Token::BreakType::CONSISTENT
         @space = block.offset - token.offset
@@ -146,23 +146,23 @@ module Oppen
           if config&.indent_anchor == Config::IndentAnchor::ON_BEGIN
             token.offset
           else
-            margin - space
+            width - space
           end
         write token.line_continuation
         print_new_line indent
       in Token::BreakType::INCONSISTENT
-        if token_length > space
+        if token_width > space
           @space = block.offset - token.offset
           indent =
             if config&.indent_anchor == Config::IndentAnchor::ON_BEGIN
               token.offset
             else
-              margin - space
+              width - space
             end
           write token.line_continuation
           print_new_line indent
         else
-          @space -= token.length
+          @space -= token.width
           write token
         end
       end
@@ -171,13 +171,13 @@ module Oppen
     # Handle String Token.
     #
     # @param token [Token]
-    # @param token_length [Integer]
+    # @param token_width [Integer]
     #
     # @return [Nil]
     #
     # @see Token::String
-    def handle_string(token, token_length)
-      @space = [0, space - token_length].max
+    def handle_string(token, token_width)
+      @space = [0, space - token_width].max
       write token
     end
 
@@ -222,8 +222,8 @@ module Oppen
     def print_new_line(amount)
       write new_line
       if config&.indent_anchor == Config::IndentAnchor::ON_BEGIN
-        @space = margin - top.offset - amount
-        indent margin - space
+        @space = width - top.offset - amount
+        indent width - space
       else
         indent amount
       end

data/lib/oppen/printer.rb

@@ -4,6 +4,7 @@ require 'stringio'
 
 require_relative 'scan_stack'
 require_relative 'print_stack'
+require_relative 'utils'
 
 # Oppen.
 module Oppen
@@ -48,9 +49,18 @@ module Oppen
     # @note Called token in the original paper.
     attr_reader :tokens
 
-    # @note Called PrettyPrintInit in the original paper.
+    # Some description
     #
-    # @param margin   [Integer] maximum line width desired.
+    # @example
+    #   "This is a string" # => and this is a comment
+    #   out = Oppen::Wadler.new (margin: 13) # Hawn
+    #   # Baliz
+    #
+    # @example
+    #   "This is a string" # => and this is a comment
+    #   # var = 12
+    #
+    # @param width [Integer] maximum line width desired.
     # @param new_line [String]  the delimiter between lines.
     # @param config [Config]
     # @param space [String, Proc] could be a String or a callable.
@@ -60,18 +70,18 @@ module Oppen
     #   If it's a callable, it will receive `n` and it needs to return
     #   a string.
     # @param out [Object] should have a write and string method
-    def initialize(margin, new_line, config = Config.oppen,
+    def initialize(width, new_line, config = Config.oppen,
                    space = ' ', out = StringIO.new)
       # Maximum size if the stacks
-      n = 3 * margin
+      n = 3 * width
 
       @config = config
       @left = 0
       @left_total = 1
-      @print_stack = PrintStack.new margin, new_line, config, space, out
+      @print_stack = PrintStack.new width, new_line, config, space, out
       @right = 0
       @right_total = 1
-      @scan_stack = ScanStack.new n
+      @scan_stack = ScanStack.new n, config
       @size = Array.new n
       @tokens = Array.new n
     end
@@ -148,7 +158,7 @@ module Oppen
         tokens[right] = token
         size[right] = -1
         scan_stack.push right
-        if config&.eager_print &&
+        if config&.eager_print? &&
            (!scan_stack.empty? && right_total - left_total < print_stack.space)
           check_stack 0
           advance_left tokens[left], size[left]
@@ -174,7 +184,7 @@ module Oppen
       scan_stack.push right
       tokens[right] = token
       size[right] = -right_total
-      @right_total += token.length
+      @right_total += token.width
     end
 
     # Handle String Token.
@@ -184,12 +194,12 @@ module Oppen
     # @see Token::String
     def handle_string(token)
       if scan_stack.empty?
-        print_stack.print token, token.length
+        print_stack.print token, token.width
       else
         advance_right
         tokens[right] = token
-        size[right] = token.length
-        @right_total += token.length
+        size[right] = token.width
+        @right_total += token.width
         check_stream
       end
     end
@@ -220,7 +230,10 @@ module Oppen
       @right = (right + 1) % scan_stack.length
       return if right != left
 
-      raise 'Token queue full'
+      raise 'Token queue full' if !config.upsize_stack?
+
+      @size, = Utils.upsize_circular_array(@size, @left)
+      @tokens, @left, @right = Utils.upsize_circular_array(@tokens, @left)
     end
 
     # Advances the `left` pointer and lets the print stack
@@ -229,16 +242,16 @@ module Oppen
     # @note Called AdvanceLeft as well in the original paper.
     #
     # @return [Nil]
-    def advance_left(token, token_length)
-      return if token_length.negative?
+    def advance_left(token, token_width)
+      return if token_width.negative?
 
-      print_stack.print token, token_length
+      print_stack.print token, token_width
 
       case token
       when Token::Break
-        @left_total += token.length
+        @left_total += token.width
       when Token::String
-        @left_total += token_length
+        @left_total += token_width
       end
 
       return if left == right

data/lib/oppen/scan_stack.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'utils'
+
 # Oppen.
 module Oppen
   # A fixed-size stack that can be popped from top and bottom.
   class ScanStack
-    def initialize(size)
+    def initialize(size, config)
       @bottom = 0
+      @config = config
       @empty = true
       @stack = Array.new(size)
       @top = 0
@@ -68,7 +71,9 @@ module Oppen
       else
         @top = increment(@top)
         if @top == @bottom
-          raise 'Stack full'
+          raise 'Stack full' if !@config.upsize_stack?
+
+          @stack, @bottom, @top = Utils.upsize_circular_array(@stack, @bottom)
         end
       end
       @stack[@top] = value

data/lib/oppen/token.rb

@@ -18,60 +18,50 @@ module Oppen
       CONSISTENT = 2
     end
 
-    # Default token length
+    # Default token width
     # @return [Integer]
-    def length
-      0
-    end
+    def width = 0
 
     # String Token.
     class String < Token
       # @return [String] String value.
       attr_reader :value
+      # @return [Integer]
+      attr_reader :width
 
-      def initialize(value)
+      def initialize(value, width: value.length)
         @value = value
+        @width = width
         super()
       end
 
-      # @return [Integer]
-      def length
-        value.length
-      end
-
       # @return [String]
-      def to_s
-        value
-      end
+      def to_s = value
     end
 
     # Break Token.
     class Break < Token
-      # @return [String] Break strings.
-      attr_reader :str
       # @return [String] If a new line is needed display this string before the new line
       attr_reader :line_continuation
       # @return [Integer] Indentation.
       attr_reader :offset
+      # @return [String] Break strings.
+      attr_reader :str
+      # @return [Integer]
+      attr_reader :width
 
-      def initialize(str = ' ', line_continuation: '', offset: 0)
+      def initialize(str = ' ', width: str.length, line_continuation: '', offset: 0)
         raise ArgumentError, 'line_continuation cannot be nil' if line_continuation.nil?
 
         @line_continuation = line_continuation
         @offset = offset
         @str = str
+        @width = width
         super()
       end
 
-      # @return [Integer]
-      def length
-        str.length
-      end
-
       # @return [String]
-      def to_s
-        str
-      end
+      def to_s = str
     end
 
     # Distinguished instance of Break which forces a line break.
@@ -79,9 +69,7 @@ module Oppen
       # Mock string that represents an infinite string to force new line.
       class LineBreakString
         # @return [Integer]
-        def length
-          999_999
-        end
+        def length = 999_999
       end
 
       def initialize(line_continuation: '', offset: 0)

data/lib/oppen/utils.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+# Oppen.
+module Oppen
+  # Utils.
+  module Utils
+    # Rotates circular array and triples its size.
+    # @param arr [Array]
+    # @param offset [Integer] Rotation amount
+    #
+    # @return [Array(Array, Integer, Integer)] upsized array, lhs, rhs
+    def self.upsize_circular_array(arr, offset)
+      size = arr.size
+      arr = arr.rotate(offset)
+      arr.fill(nil, size, 2 * size)
+      [arr, 0, size]
+    end
+  end
+end

data/lib/oppen/version.rb

@@ -5,5 +5,5 @@ module Oppen
   # Oppen version
   #
   # @return [String] current version
-  VERSION = '0.9.0' # managed by release.sh
+  VERSION = '0.9.1' # managed by release.sh
 end

data/lib/oppen.rb

@@ -18,15 +18,15 @@ module Oppen
   #   to indent.
   #   If it's a callable, it will receive `n` and it needs to return
   #   a string.
-  # @param margin [Integer] maximum line width desired
   # @param new_line [String] the delimiter between lines
   # @param out [Object] should have a write and string method
   # @param tokens [Array[Token]] the list of tokens to be printed
+  # @param width [Integer] maximum line width desired
   #
   # @return [String] output of the pretty printer
   def self.print(config: Config.oppen, space: ' ',
-                 margin: 80, new_line: "\n", out: StringIO.new, tokens: [])
-    printer = Printer.new margin, new_line, config, space, out
+                 new_line: "\n", out: StringIO.new, tokens: [], width: 80)
+    printer = Printer.new width, new_line, config, space, out
     tokens.each do |token|
       printer.print token
     end
@@ -47,10 +47,17 @@ module Oppen
     end
 
     attr_accessor :indent_anchor
+
+    def initialize(indent_anchor: IndentAnchor::ON_BREAK, eager_print: false, upsize_stack: false)
+      @indent_anchor = indent_anchor
+      @eager_print = eager_print
+      @upsize_stack = upsize_stack
+    end
+
     # Print groups eagerly
     #
     # @example
-    #  out = Oppen::Wadler.new (margin: 13)
+    #  out = Oppen::Wadler.new (width: 13)
     #  out.group {
     #    out.group {
     #      out.text 'abc'
@@ -76,12 +83,9 @@ module Oppen
     #  # jkl
     #
     # @return [Boolean]
-    attr_accessor :eager_print
+    def eager_print? = @eager_print
 
-    def initialize(indent_anchor: IndentAnchor::ON_BREAK, eager_print: false)
-      @indent_anchor = indent_anchor
-      @eager_print = eager_print
-    end
+    def upsize_stack? = @upsize_stack
 
     # Default config for Oppen usage
     # @return [Config]
@@ -91,25 +95,27 @@ module Oppen
 
     # Default config for Wadler usage
     # @return [Config]
-    def self.wadler(eager_print: true)
-      new(indent_anchor: IndentAnchor::ON_BEGIN, eager_print:)
+    def self.wadler(eager_print: true, upsize_stack: true)
+      new(indent_anchor: IndentAnchor::ON_BEGIN, eager_print:, upsize_stack:)
     end
   end
 
   # @param value [String]
+  # @param width [Integer] token width that defaults to value.length
   #
   # @return [Oppen::Token::String] a new String token
-  def self.string(value)
-    Token::String.new(value)
+  def self.string(value, width: value.length)
+    Token::String.new(value, width:)
   end
 
   # @param str [String]
   # @param line_continuation [String] If a new line is needed display this string before the new line
   # @param offset [Integer]
+  # @param width [Integer] token width that defaults to str.length
   #
   # @return [Oppen::Token::Break] a new Break token
-  def self.break(str = ' ', line_continuation: '', offset: 0)
-    Token::Break.new(str, line_continuation:, offset:)
+  def self.break(str = ' ', line_continuation: '', offset: 0, width: str.length)
+    Token::Break.new(str, width:, line_continuation:, offset:)
   end
 
   # @param line_continuation [String] If a new line is needed display this string before the new line

data/lib/wadler/print.rb

@@ -7,10 +7,10 @@ module Oppen
     attr_reader :config
     attr_reader :current_indent
     attr_reader :space
-    attr_reader :margin
     attr_reader :new_line
     attr_reader :out
     attr_reader :tokens
+    attr_reader :width
 
     # @param config [Oppen::Config]
     # @param space [String, Proc] could be a String or a callable.
@@ -19,15 +19,15 @@ module Oppen
     #   to indent.
     #   If it's a callable, it will receive `n` and it needs to return
     #   a string.
-    # @param margin [Integer]
     # @param new_line [String]
     # @param out [Object] should have a write and string method
+    # @param width [Integer]
     def initialize(config: Config.wadler, space: ' ',
-                   margin: 80, new_line: "\n", out: StringIO.new)
+                   new_line: "\n", out: StringIO.new, width: 80)
       @config = config
       @current_indent = 0
       @space = space
-      @margin = margin
+      @width = width
       @new_line = new_line
       @out = out
       @tokens = []
@@ -38,7 +38,7 @@ module Oppen
       if !tokens.last.is_a? Oppen::Token::EOF
         tokens << Oppen.eof
       end
-      Oppen.print(tokens:, margin:, new_line:, config:, space:, out:)
+      Oppen.print(tokens:, new_line:, config:, space:, out:, width:)
     end
 
     # @param indent [Integer] group indentation
@@ -110,16 +110,16 @@ module Oppen
     # @param value [String]
     #
     # @return [Nil]
-    def text(value)
-      tokens << Oppen.string(value)
+    def text(value, width: value.length)
+      tokens << Oppen.string(value, width:)
     end
 
     # @param str [String]
     # @param line_continuation [String] If a new line is needed display this string before the new line
     #
     # @return [Nil]
-    def breakable(str = ' ', line_continuation: '')
-      tokens << Oppen.break(str, line_continuation:, offset: current_indent)
+    def breakable(str = ' ', width: str.length, line_continuation: '')
+      tokens << Oppen.break(str, width:, line_continuation:, offset: current_indent)
     end
 
     # @param line_continuation [String] If a new line is needed display this string before the new line

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oppen
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Amine Mike El Maalouf <amine.el-maalouf@epita.fr>
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-27 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies: []
 description: Implementation of the Oppen's pretty printing algorithm
 email: 
@@ -24,6 +24,7 @@ files:
 - lib/oppen/printer.rb
 - lib/oppen/scan_stack.rb
 - lib/oppen/token.rb
+- lib/oppen/utils.rb
 - lib/oppen/version.rb
 - lib/wadler/print.rb
 homepage: http://github.com/Faveod/oppen-ruby