liquid2 0.2.0 → 0.3.1

data/sig/liquid2.rbs

@@ -82,7 +82,75 @@ module Liquid2
 
     @globals: Hash[String, untyped]?
 
-    @scanner: StringScanner
+    @scanner: singleton(Scanner)
+
+    @parser: singleton(Parser)
+
+    @string_scanner: StringScanner
+
+    @arithmetic_operators: bool
+
+    # The string of characters that indicate the start of a Liquid output statement.
+    @markup_out_start: String
+
+    # The string of characters that indicate the end of a Liquid output statement.
+    @markup_out_end: String
+
+    # The string of characters that indicate the start of a Liquid tag.
+    @markup_tag_start: String
+
+    # The string of characters that indicate the end of a Liquid tag.
+    @markup_tag_end: String
+
+    # The string of characters that indicate the start of a Liquid comment. This should
+    # include a single trailing `#`. Additional, variable length hashes will be handled
+    # by the tokenizer. It is not possible to change comment syntax to not use `#`.
+    @markup_comment_prefix: String
+
+    # The string of characters that indicate the end of a Liquid comment, excluding any
+    # hashes.
+    @markup_comment_suffix: String
+
+    # A regex pattern matching Liquid tag names. Should include `#` for inline comments.
+    @re_tag_name: Regexp
+
+    @re_word: Regexp
+
+    @re_int: Regexp
+
+    @re_float: Regexp
+
+    @re_double_quote_string_special: Regexp
+
+    @re_single_quote_string_special: Regexp
+
+    # A regex pattern matching the start of some Liquid markup. Could be the start of an
+    # output statement, tag or comment. Traditionally `{{`, `{%` and `{#`, respectively.
+    @re_markup_start: Regexp
+
+    # A regex pattern matching the end of some Liquid markup. Could be the end of
+    # an output statement or tag. Traditionally `}}`, `%}`, respectively.
+    # respectively.
+    @re_markup_end: Regexp
+
+    # A regex pattern matching any one of the possible characters ending some Liquid
+    # markup. This is used to detect incomplete and malformed markup and provide
+    # helpful error messages.
+    @re_markup_end_chars: Regexp
+
+    @re_up_to_markup_start: Regexp
+
+    @re_punctuation: Regexp
+
+    @re_up_to_inline_comment_end: Regexp
+
+    @re_up_to_raw_end: Regexp
+
+    @re_block_comment_chunk: Regexp
+
+    @re_up_to_doc_end: Regexp
+
+    @re_line_statement_comment: Regexp
 
     attr_reader tags: Hash[String, _Tag]
 
@@ -102,7 +170,53 @@ module Liquid2
 
     attr_reader falsy_undefined: bool
 
-    def initialize: (?context_depth_limit: ::Integer, ?globals: Hash[String, untyped]?, ?loader: TemplateLoader?, ?local_namespace_limit: Integer?, ?loop_iteration_limit: Integer?, ?output_stream_limit: Integer?, ?shorthand_indexes: bool, ?suppress_blank_control_flow_blocks: bool, ?undefined: singleton(Undefined), ?falsy_undefined: bool) -> void
+    attr_reader arithmetic_operators: bool
+
+    attr_reader markup_comment_prefix: String
+
+    attr_reader markup_comment_suffix: String
+
+    attr_reader markup_out_end: String
+
+    attr_reader markup_out_start: String
+
+    attr_reader markup_tag_end: String
+
+    attr_reader markup_tag_start: String
+
+    attr_reader re_tag_name: Regexp
+
+    attr_reader re_word: Regexp
+
+    attr_reader re_int: Regexp
+
+    attr_reader re_float: Regexp
+
+    attr_reader re_double_quote_string_special: Regexp
+
+    attr_reader re_single_quote_string_special: Regexp
+
+    attr_reader re_markup_start: Regexp
+
+    attr_reader re_markup_end: Regexp
+
+    attr_reader re_markup_end_chars: Regexp
+
+    attr_reader re_up_to_markup_start: Regexp
+
+    attr_reader re_punctuation: Regexp
+
+    attr_reader re_up_to_inline_comment_end: Regexp
+
+    attr_reader re_up_to_raw_end: Regexp
+
+    attr_reader re_block_comment_chunk: Regexp
+
+    attr_reader re_up_to_doc_end: Regexp
+
+    attr_reader re_line_statement_comment: Regexp
+
+    def initialize: (?arithmetic_operators: bool, ?context_depth_limit: ::Integer, ?falsy_undefined: bool, ?globals: untyped?, ?loader: TemplateLoader?, ?local_namespace_limit: Integer?, ?loop_iteration_limit: Integer?, ?markup_comment_prefix: ::String, ?markup_comment_suffix: ::String, ?markup_out_end: ::String, ?markup_out_start: ::String, ?markup_tag_end: ::String, ?markup_tag_start: ::String, ?output_stream_limit: Integer?, ?parser: singleton(Parser), ?scanner: singleton(Scanner), ?shorthand_indexes: bool, ?suppress_blank_control_flow_blocks: bool, ?undefined: singleton(Undefined)) -> void
 
     # @param source [String] template source text.
     # @return [Template]
@@ -132,6 +246,8 @@ module Liquid2
     def delete_tag: (String name) -> (_Tag | nil) 
 
     def setup_tags_and_filters: () -> void
+                              
+    def setup_scanner: () -> void
 
     def undefined: (String name, ?node: _HasToken?) -> Undefined
 
@@ -167,37 +283,59 @@ module Liquid2
     # A pointer to the start of the current token.
     @start: Integer
 
-    # Tokens are arrays of (kind, value, start index)
-    @tokens: Array[[Symbol, String?, Integer]]
+    @s_out_start: String
 
-    attr_reader tokens: Array[[Symbol, String?, Integer]]
+    @s_out_end: String
+
+    @s_tag_start: String
+
+    @s_tag_end: String
+
+    @s_comment_prefix: String
+
+    @s_comment_suffix: String
 
-    RE_MARKUP_START: ::Regexp
+    @re_tag_name: Regexp
 
-    RE_WHITESPACE: ::Regexp
+    @re_word: Regexp
 
-    RE_LINE_SPACE: ::Regexp
+    @re_int: Regexp
 
-    RE_WORD: ::Regexp
+    @re_float: Regexp
 
-    RE_INT: ::Regexp
+    @re_double_quote_string_special: Regexp
 
-    RE_FLOAT: ::Regexp
+    @re_single_quote_string_special: Regexp
 
-    RE_PUNCTUATION: ::Regexp
+    @re_markup_start: Regexp
 
-    RE_SINGLE_QUOTE_STRING_SPECIAL: ::Regexp
+    @re_markup_end: Regexp
 
-    RE_DOUBLE_QUOTE_STRING_SPECIAL: ::Regexp
+    @re_markup_end_chars: Regexp
+
+    @re_up_to_markup_start: Regexp
+
+    @re_punctuation: Regexp
+
+    @re_up_to_inline_comment_end: Regexp
+    @re_up_to_raw_end: Regexp
+    @re_block_comment_chunk: Regexp
+    @re_up_to_doc_end: Regexp
+    @re_line_statement_comment: Regexp
+
+    # Tokens are arrays of (kind, value, start index)
+    @tokens: Array[[Symbol, String?, Integer]]
+
+    attr_reader tokens: Array[[Symbol, String?, Integer]]
 
     # Keywords and symbols that get their own token kind.
     TOKEN_MAP: Hash[String, Symbol]
 
-    def self.tokenize: (String source, StringScanner scanner) -> Array[[Symbol, String?, Integer]]
+    def self.tokenize: (Environment env, String source, StringScanner scanner) -> Array[[Symbol, String?, Integer]]
 
     # @param source [String]
     # @param scanner [StringScanner]
-    def initialize: (String source, StringScanner scanner) -> void
+    def initialize: (Environment env, String source, StringScanner scanner) -> void
 
     def run: () -> void
 
@@ -375,6 +513,12 @@ module Liquid2
       MEMBERSHIP: 6
 
       PREFIX: 7
+
+      ADD_SUB: 8
+
+      MUL_DIV: 9
+      
+      POW: 10
     end
 
     PRECEDENCES: Hash[Symbol, Integer]
@@ -609,29 +753,33 @@ module Liquid2
 
     def []: (*untyped) ?{ (?) -> untyped } -> self
 
-    def key?: (*untyped) ?{ (?) -> untyped } -> false
+    def key?: (*untyped) ?{ (?) -> untyped } -> untyped
 
-    def include?: (*untyped) ?{ (?) -> untyped } -> false
+    def include?: (*untyped) ?{ (?) -> untyped } -> untyped
 
-    def member?: (*untyped) ?{ (?) -> untyped } -> false
+    def member?: (*untyped) ?{ (?) -> untyped } -> untyped
 
     def fetch: (*untyped) ?{ (?) -> untyped } -> self
 
-    def !: () -> true
+    def !: () -> untyped
 
     def ==: (untyped other) -> untyped
 
     alias eql? ==
 
-    def size: () -> 0
+    def size: () -> untyped
 
-    def length: () -> 0
+    def length: () -> untyped
 
     def to_s: () -> ""
 
-    def to_i: () -> 0
+    def to_i: () -> untyped
+            
+    def +@: () -> untyped
+          
+    def -@: () -> untyped
 
-    def to_f: () -> ::Float
+    def to_f: () -> untyped
 
     def each: (*untyped) ?{ (?) -> untyped } -> untyped
 
@@ -639,9 +787,9 @@ module Liquid2
                        
     def join: (*untyped) -> ""
 
-    def to_liquid: (RenderContext _context) -> nil
+    def to_liquid: (RenderContext _context) -> untyped
 
-    def poke: () -> true
+    def poke: () -> bool
   end
 
   # An undefined type that always raises an exception.
@@ -679,6 +827,10 @@ module Liquid2
     def to_s: () -> untyped
 
     def to_i: () -> untyped
+            
+    def +@: () -> untyped
+          
+    def -@: () -> untyped
 
     def to_f: () -> untyped
 
@@ -1593,7 +1745,7 @@ module Liquid2
     def self.to_integer: (untyped obj) -> Integer
 
     # Cast _obj_ to a number, favouring BigDecimal over Float.
-    def self.to_decimal: (untyped obj, ?default: ::Integer) -> (Integer | BigDecimal | Numeric)
+    def self.to_decimal: (untyped obj, ?default: untyped) -> (Integer | BigDecimal | Numeric)
 
     # Cast _obj_ to a  date and time. Return `nil` if casting fails.
     def self.to_date: (untyped obj) -> untyped
@@ -1742,6 +1894,8 @@ module Liquid2
     
     # Return the subsequence of _left_ starting at _start_ up to _length_.
     def self.slice: (untyped left, untyped start, ?untyped length) -> untyped
+                  
+    def self.better_slice: (untyped left, ?untyped start_, ?untyped stop_, ?untyped step_, ?start: untyped, ?stop: untyped, ?step: untyped) -> untyped
 
     # Return _left_ with all characters converted to uppercase.
     # Coerce _left_ to a string if it is not one already.
@@ -2551,4 +2705,71 @@ module Liquid2
 
     def block_scope: () -> Array[Identifier]
   end
-end
+end
+
+module Liquid2
+  # Base class for all arithmetic expressions.
+  class ArithmeticExpression < Expression
+    @left: untyped
+
+    @right: untyped
+
+    # @param left [Expression]
+    # @param right [Expression]
+    def initialize: ([Symbol, String?, Integer] token, untyped left, untyped right) -> void
+
+    def children: () -> ::Array[untyped]
+
+    def inner_evaluate: (untyped context) -> ::Array[untyped]
+  end
+
+  # Infix addition
+  class Plus < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Infix subtraction
+  class Minus < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Infix multiplication
+  class Times < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Infix division
+  class Divide < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Infix modulo
+  class Modulo < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Infix exponentiation
+  class Pow < ArithmeticExpression
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Prefix negation
+  class Negative < Expression
+    @right: untyped
+
+    # @param right [Expression]
+    def initialize: ([Symbol, String?, Integer] token, untyped right) -> void
+
+    def evaluate: (RenderContext context) -> untyped
+  end
+
+  # Prefix positive
+  class Positive < Expression
+    @right: untyped
+
+    # @param right [Expression]
+    def initialize: ([Symbol, String?, Integer] token, untyped right) -> void
+
+    def evaluate: (RenderContext context) -> untyped
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquid2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Prior
@@ -85,6 +85,7 @@ files:
 - lib/liquid2/errors.rb
 - lib/liquid2/expression.rb
 - lib/liquid2/expressions/arguments.rb
+- lib/liquid2/expressions/arithmetic.rb
 - lib/liquid2/expressions/array.rb
 - lib/liquid2/expressions/blank.rb
 - lib/liquid2/expressions/boolean.rb