skeem 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8031a69d8a362bbe17e4dabe5fb6ced12ff4ca70f2d6577f5ec13ff81b8bd3ad
-  data.tar.gz: 17f74953cc15cd97d84ede36c17f9d4e97873710d8c94ecfdb50e76019cf3bd2
+  metadata.gz: 6ab3868544bc84674f7828b4bf258177afc7f1192ca46ea3979328ca4a410a8c
+  data.tar.gz: 178e5b66fed7677ef7f7a6409cd7c8fb91284654622935389cd3a0c4009b3fed
 SHA512:
-  metadata.gz: 65521fe50624af6e01bacb890ae3b1ddf9f6acb5a1a3a31fd5cfb1b20143101c0aad531a1f3773b50585a6bed8a18380897f47786ecfdc3c53140e7686e17876
-  data.tar.gz: 3a5d8cac363099882da772135498df5c24449eedc6831a2fe09f840764afd12d22ad4fa74589dd92309875407cf77a334fc704d6914a93988debfd65b31a2d35
+  metadata.gz: 33868367a6683ed547c5ebe19cbad9e2dee76c6b0dbd07e4a0077b6012b698a8e8d551095e82484911a71df0590f373d24e7b11a334fa760c23507e030a44314
+  data.tar.gz: f9726a3849a9eee31061404cf900e9529fa07db9d63663b9334105397b4c02fe2754951561049419c5e436cf846635548cd15c02e006e17ad4170e33a24be487

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.19] - 2021-08-30
+- Grammar refactoring: use ?, * and + modifiers in Rley 0.8.03 rules
+
+### Changed
+- File `grammar.rb`: Remove redundant rules after introduction og ?, * and + modifiers
+- Class `SkmBuilder`: Removal of useless methods after removal of their rule counterpart
+
+
+
 ## [0.2.18] - 2021-08-29
 - Minor refactoring for Rley 0.8.03
 - Code restyling to please rubocop 1.19.1.

data/lib/skeem/grammar.rb

@@ -36,7 +36,7 @@ module Skeem
     rule('definition' => 'LPAREN DEFINE IDENTIFIER expression RPAREN').as 'definition'
     rule('definition' => 'LPAREN DEFINE LPAREN IDENTIFIER def_formals RPAREN body RPAREN').as 'alt_definition'
     rule('definition' => 'syntax_definition')
-    rule('definition' => 'LPAREN BEGIN definition_star RPAREN').as 'definitions_within_begin'
+    rule('definition' => 'LPAREN BEGIN definition* RPAREN').as 'definitions_within_begin'
     rule('expression' => 'IDENTIFIER').as 'variable_reference'
     rule 'expression' => 'literal'
     rule 'expression' => 'procedure_call'
@@ -63,143 +63,104 @@ module Skeem
     rule 'simple_datum' => 'symbol'
     rule 'compound_datum' => 'list'
     rule 'compound_datum' => 'vector'
-    rule('list' => 'LPAREN datum_star RPAREN').as 'list'
+    rule('list' => 'LPAREN datum* RPAREN').as 'list'
     rule('list' => 'LPAREN datum_plus PERIOD datum RPAREN').as 'dotted_list'
-    rule('vector' => 'VECTOR_BEGIN datum_star RPAREN').as 'vector'
+    rule('vector' => 'VECTOR_BEGIN datum* RPAREN').as 'vector'
     rule('datum_plus' => 'datum_plus datum').as 'multiple_datums'
     rule('datum_plus' => 'datum').as 'last_datum'
-    rule('datum_star' => 'datum_star datum').as 'star_default'
-    rule('datum_star' => []).as 'star_base' ## 'no_datum_yet'
     rule 'symbol' => 'IDENTIFIER'
     rule('procedure_call' => 'LPAREN operator RPAREN').as 'proc_call_nullary'
-    rule('procedure_call' => 'LPAREN operator operand_plus RPAREN').as 'proc_call_args'
-    rule('operand_plus' => 'operand_plus operand').as 'multiple_operands'
-    rule('operand_plus' => 'operand').as 'last_operand'
+    rule('procedure_call' => 'LPAREN operator operand+ RPAREN').as 'proc_call_args'
     rule 'operator' => 'expression'
     rule 'operand' => 'expression'
-    rule('def_formals' => 'identifier_star').as 'def_formals'
-    rule('def_formals' => 'identifier_star PERIOD IDENTIFIER').as 'pair_formals'
+    rule('def_formals' => 'IDENTIFIER*').as 'def_formals'
+    rule('def_formals' => 'IDENTIFIER* PERIOD IDENTIFIER').as 'pair_formals'
     rule('lambda_expression' => 'LPAREN LAMBDA formals body RPAREN').as 'lambda_expression'
-    rule('formals' => 'LPAREN identifier_star RPAREN').as 'fixed_arity_formals'
+    rule('formals' => 'LPAREN IDENTIFIER* RPAREN').as 'fixed_arity_formals'
     rule('formals' => 'IDENTIFIER').as 'variadic_formals'
-    rule('formals' => 'LPAREN identifier_plus PERIOD IDENTIFIER RPAREN').as 'dotted_formals'
+    rule('formals' => 'LPAREN IDENTIFIER+ PERIOD IDENTIFIER RPAREN').as 'dotted_formals'
     rule('syntax_definition' => 'LPAREN DEFINE-SYNTAX keyword transformer_spec RPAREN').as 'syntax_definition'
-    rule('identifier_star' => 'identifier_star IDENTIFIER').as 'star_default'
-    rule('identifier_star' => []).as 'star_base' ## 'no_identifier_yet'
-    rule('identifier_plus' => 'identifier_plus IDENTIFIER').as 'multiple_identifiers'
-    rule('identifier_plus' => 'IDENTIFIER').as 'last_identifier'
-    rule('body' => 'definition_star sequence').as 'body'
-    rule('definition_star' => 'definition_star definition').as 'star_default'
-    rule('definition_star' => []).as 'star_base' ## 'no_definition_yet'
-    rule('sequence' => 'command_star expression').as 'sequence'
-    rule('command_star' => 'command_star command').as 'star_default'
-    rule('command_star' => []).as 'star_base' ## 'no_command_yet'
-    rule('conditional' => 'LPAREN IF test consequent alternate RPAREN').as 'conditional'
+    rule('body' => 'definition* sequence').as 'body'
+    rule('sequence' => 'command* expression').as 'sequence'
+    rule('conditional' => 'LPAREN IF test consequent expression? RPAREN').as 'conditional'
     rule 'test' => 'expression'
     rule 'consequent' => 'expression'
-    rule 'alternate' => 'expression'
-    rule 'alternate' => []
     rule 'number' => 'INTEGER'
     rule 'number' => 'RATIONAL'
     rule 'number' => 'REAL'
     rule('assignment' => 'LPAREN SET! IDENTIFIER expression RPAREN').as 'assignment'
-    rule('derived_expression' => 'LPAREN COND cond_clause_plus RPAREN').as 'cond_form'
-    rule('derived_expression' => 'LPAREN COND cond_clause_star LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
-    rule('derived_expression' => 'LPAREN LET LPAREN binding_spec_star RPAREN body RPAREN').as 'short_let_form'
+    rule('derived_expression' => 'LPAREN COND cond_clause+ RPAREN').as 'cond_form'
+    rule('derived_expression' => 'LPAREN COND cond_clause* LPAREN ELSE sequence RPAREN RPAREN').as 'cond_else_form'
+    rule('derived_expression' => 'LPAREN LET LPAREN binding_spec* RPAREN body RPAREN').as 'short_let_form'
     # TODO: implement "named let"
-    rule('derived_expression' => 'LPAREN LET IDENTIFIER LPAREN binding_spec_star RPAREN body RPAREN') # .as 'named_form'
-    rule('derived_expression' => 'LPAREN LET_STAR LPAREN binding_spec_star RPAREN body RPAREN').as 'let_star_form'
+    rule('derived_expression' => 'LPAREN LET IDENTIFIER LPAREN binding_spec* RPAREN body RPAREN') # .as 'named_form'
+    rule('derived_expression' => 'LPAREN LET_STAR LPAREN binding_spec* RPAREN body RPAREN').as 'let_star_form'
 
     # As the R7RS grammar is too restrictive,
     # the next rule was made more general than its standard counterpart
     rule('derived_expression' => 'LPAREN BEGIN body RPAREN').as 'begin_expression'
     do_syntax = <<-END_SYNTAX
-    LPAREN DO LPAREN iteration_spec_star RPAREN
+    LPAREN DO LPAREN iteration_spec* RPAREN
       LPAREN test do_result RPAREN
       command_star RPAREN
 END_SYNTAX
     rule('derived_expression' => do_syntax).as 'do_expression'
     rule 'derived_expression' => 'quasiquotation'
-    rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
-    rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
-    rule('cond_clause_star' => 'cond_clause_star cond_clause').as 'star_default'
-    rule('cond_clause_star' => []).as 'star_base' ## 'last_cond_clauses_star'
     rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
     rule('cond_clause' => 'LPAREN test RPAREN')
     rule('cond_clause' => 'LPAREN test ARROW recipient RPAREN').as 'cond_arrow_clause'
     rule('recipient' => 'expression')
     rule('quasiquotation' => 'LPAREN QUASIQUOTE qq_template RPAREN').as 'quasiquotation'
     rule('quasiquotation' => 'GRAVE_ACCENT qq_template').as 'quasiquotation_short'
-    rule('binding_spec_star' => 'binding_spec_star binding_spec').as 'star_default'
-    rule('binding_spec_star' => []).as 'star_base' ## 'no_binding_spec_yet'
     rule('binding_spec' => 'LPAREN IDENTIFIER expression RPAREN').as 'binding_spec'
-    rule('iteration_spec_star' => 'iteration_spec_star iteration_spec').as 'star_default'
-    rule('iteration_spec_star' => []).as 'star_base' ## 'no_iter_spec_yet'
     rule('iteration_spec' => 'LPAREN IDENTIFIER init step RPAREN').as 'iteration_spec_long'
     rule('iteration_spec' => 'LPAREN IDENTIFIER init RPAREN').as 'iteration_spec_short'
     rule('init' => 'expression')
     rule('step' => 'expression')
-    rule 'do_result' => 'sequence'
-    rule('do_result' => []).as 'star_base' ## 'empty_do_result'
+    rule 'do_result' => 'sequence?'
     rule('keyword' => 'IDENTIFIER')
-    rule('includer' => 'LPAREN INCLUDE string_plus RPAREN').as 'include'
-    rule('string_plus' => 'string_plus STRING_LIT').as 'multiple_string'
-    rule('string_plus' => 'STRING_LIT').as 'last_single_string'
+    rule('includer' => 'LPAREN INCLUDE STRING_LIT+ RPAREN').as 'include'
     rule 'qq_template' => 'simple_datum'
     rule 'qq_template' => 'list_qq_template'
     rule 'qq_template' => 'vector_qq_template'
     rule 'qq_template' => 'unquotation'
-    rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
-    rule 'list_qq_template' => 'LPAREN qq_template_or_splice_plus PERIOD qq_template RPAREN'
+    rule('list_qq_template' => 'LPAREN qq_template_or_splice* RPAREN').as 'list_qq'
+    rule 'list_qq_template' => 'LPAREN qq_template_or_splice+ PERIOD qq_template RPAREN'
     rule 'list_qq_template' => 'GRAVE_ACCENT qq_template'
-    rule('vector_qq_template' => 'VECTOR_BEGIN qq_template_or_splice_star RPAREN').as 'vector_qq'
+    rule('vector_qq_template' => 'VECTOR_BEGIN qq_template_or_splice* RPAREN').as 'vector_qq'
     rule('unquotation' => 'COMMA qq_template').as 'unquotation_short'
     rule 'unquotation' => 'LPAREN UNQUOTE qq_template RPAREN'
-    rule('qq_template_or_splice_star' => 'qq_template_or_splice_star qq_template_or_splice').as 'star_default'
-    rule('qq_template_or_splice_star' => []).as 'star_base' ## 'no_template_splice_yet'
-    rule 'qq_template_or_splice_plus' => 'qq_template_or_splice_plus qq_template_or_splice'
-    rule 'qq_template_or_splice_plus' => 'qq_template_or_splice'
     rule 'qq_template_or_splice' => 'qq_template'
     rule 'qq_template_or_splice' => 'splicing_unquotation'
     rule 'splicing_unquotation' => 'COMMA_AT_SIGN qq_template'
     rule 'splicing_unquotation' => 'LPAREN UNQUOTE-SPLICING qq_template RPAREN'
-    rule('transformer_spec' => 'LPAREN SYNTAX-RULES LPAREN identifier_star RPAREN syntax_rule_star RPAREN').as 'transformer_syntax'
-    rule('transformer_spec' => 'LPAREN SYNTAX-RULES IDENTIFIER LPAREN identifier_star RPAREN syntax_rule_star RPAREN')
-    rule('syntax_rule_star' => 'syntax_rule_star syntax_rule').as 'star_default'
-    rule('syntax_rule_star' => []).as 'star_base'
+    rule('transformer_spec' => 'LPAREN SYNTAX-RULES LPAREN IDENTIFIER* RPAREN syntax_rule* RPAREN').as 'transformer_syntax'
+    rule('transformer_spec' => 'LPAREN SYNTAX-RULES IDENTIFIER LPAREN IDENTIFIER* RPAREN syntax_rule* RPAREN')
     rule('syntax_rule' => 'LPAREN pattern template RPAREN').as 'syntax_rule'
     rule('pattern' => 'pattern_identifier')
     rule('pattern' =>  'UNDERSCORE')
-    rule('pattern' =>  'LPAREN pattern_star RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus PERIOD pattern RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus ELLIPSIS pattern_star RPAREN')
-    rule('pattern' =>  'LPAREN pattern_plus ELLIPSIS pattern_star PERIOD pattern RPAREN')
-    rule('pattern' =>  'VECTOR_BEGIN pattern_star RPAREN')
-    rule('pattern' =>  'VECTOR_BEGIN pattern_plus ELLIPSIS pattern_star RPAREN')
+    rule('pattern' =>  'LPAREN pattern* RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ PERIOD pattern RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ ELLIPSIS pattern* RPAREN')
+    rule('pattern' =>  'LPAREN pattern+ ELLIPSIS pattern* PERIOD pattern RPAREN')
+    rule('pattern' =>  'VECTOR_BEGIN pattern* RPAREN')
+    rule('pattern' =>  'VECTOR_BEGIN pattern+ ELLIPSIS pattern* RPAREN')
     rule('pattern' =>  'pattern_datum')
-    rule('pattern_star' => 'pattern_star pattern').as 'star_default'
-    rule('pattern_star' => []).as 'star_base'
-    rule('pattern_plus' => 'pattern_plus pattern')
-    rule('pattern_plus' => 'pattern')
     rule('pattern_datum' => 'STRING_LIT')
     rule('pattern_datum' => 'CHAR')
     rule('pattern_datum' => 'BOOLEAN')
     rule('pattern_datum' => 'number')
     # rule('pattern_datum' => 'bytevector')
     rule('template' => 'pattern_identifier')
-    rule('template' => 'LPAREN template_element_star RPAREN')
-    rule('template' => 'LPAREN template_element_plus PERIOD template RPAREN')
-    rule('template' =>  'VECTOR_BEGIN template_element_star RPAREN')
+    rule('template' => 'LPAREN template_element* RPAREN')
+    rule('template' => 'LPAREN template_element+ PERIOD template RPAREN')
+    rule('template' =>  'VECTOR_BEGIN template_element* RPAREN')
     rule('template' =>  'template_datum')
-    rule('template_element_star' => 'template_element_star template_element').as 'star_default'
-    rule('template_element_star' => []).as 'star_base'
-    rule('template_element_plus' => 'template_element_plus template_element')
-    rule('template_element_plus' => 'template_element')
     rule('template_element' =>  'template')
     rule('template_element' =>  'template ELLIPSIS')
     rule('template_datum' =>  'pattern_datum')
     rule('pattern_identifier' => 'IDENTIFIER')
-    # Ugly: specailized production rule per keyword...
+    # Ugly: specialized production rule per keyword...
     rule('pattern_identifier' => 'BEGIN')
     rule('pattern_identifier' => 'COND')
     rule('pattern_identifier' => 'DEFINE')

data/lib/skeem/s_expr_builder.rb

@@ -157,16 +157,6 @@ module Skeem
       pcall
     end
 
-    # rule('operand_plus' => 'operand_plus operand').as 'multiple_operands'
-    def reduce_multiple_operands(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('operand_plus' => 'operand').as 'last_operand'
-    def reduce_last_operand(_production, _range, _tokens, theChildren)
-      [theChildren.last]
-    end
-
     # rule('def_formals' => 'identifier_star').as 'def_formals'
     def reduce_def_formals(_production, _range, _tokens, theChildren)
       SkmFormals.new(theChildren[0], :fixed)
@@ -202,16 +192,6 @@ module Skeem
       SkmFormals.new(formals, :variadic)
     end
 
-    # rule('identifier_plus' => 'identifier_plus IDENTIFIER').as 'multiple_identifiers'
-    def reduce_multiple_identifiers(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('identifier_plus' => 'IDENTIFIER').as 'last_identifier'
-    def reduce_last_identifier(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('body' => 'definition_star sequence').as 'body'
     def reduce_body(_production, _range, _tokens, theChildren)
       definitions = theChildren[0].nil? ? [] : theChildren[0]
@@ -273,16 +253,6 @@ module Skeem
       SkmBindingBlock.new(:let_star, worker.bindings, body)
     end
 
-    # rule('cond_clause_plus' => 'cond_clause_plus cond_clause').as 'multiple_cond_clauses'
-    def reduce_multiple_cond_clauses(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('cond_clause_plus' => 'cond_clause').as 'last_cond_clauses'
-    def reduce_last_cond_clauses(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('cond_clause' => 'LPAREN test sequence RPAREN').as 'cond_clause'
     def reduce_cond_clause(_production, _range, _tokens, theChildren)
       [theChildren[1], SkmSequencingBlock.new(SkmPair.create_from_a(theChildren[2]))]
@@ -329,16 +299,6 @@ module Skeem
       includer.build
     end
 
-    # rule('string_plus' => 'string_plus STRING_LIT').as 'multiple_string'
-    def reduce_multiple_string(_production, _range, _tokens, theChildren)
-      theChildren[0] << theChildren[1]
-    end
-
-    # rule('string_plus' => 'STRING_LIT').as 'last_single_string'
-    def reduce_last_single_string(_production, _range, _tokens, theChildren)
-      [theChildren[0]]
-    end
-
     # rule('list_qq_template' => 'LPAREN qq_template_or_splice_star RPAREN').as 'list_qq'
     def reduce_list_qq(_production, _range, _tokens, theChildren)
       SkmPair.create_from_a(theChildren[1])

data/lib/skeem/tokenizer.rb

@@ -114,7 +114,7 @@ module Skeem
       elsif (lexeme = scanner.scan(/[+-]?[0-9]+(?:\.[0-9]*)?(?:(?:e|E)[+-]?[0-9]+)?/))
         # Order dependency: must be tested after INTEGER case
         token = build_token('REAL', lexeme)
-      elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\\(tfeiodx]|(?:\d+[=#]))/))
+      elsif (lexeme = scanner.scan(/#(?:(?:true)|(?:false)|(?:u8)|[\\(tfeiodx]|(?:\d+[=#]))/))
         token = cardinal_token(lexeme)
       elsif (lexeme = scanner.scan(/"(?:\\"|[^"])*"/)) # Double quotes literal?
         token = build_token('STRING_LIT', lexeme)
@@ -124,7 +124,7 @@ module Skeem
         token = build_token(tok_type, lexeme)
       elsif (lexeme = scanner.scan(/\|(?:[^|])*\|/)) # Vertical bar delimited
         token = build_token('IDENTIFIER', lexeme)
-      elsif (lexeme = scanner.scan(/([\+\-])((?=\s|[|()";])|$)/))
+      elsif (lexeme = scanner.scan(/([+\-])((?=\s|[|()";])|$)/))
         #  # R7RS peculiar identifiers case 1: isolated plus and minus as identifiers
         token = build_token('IDENTIFIER', lexeme)
       elsif (lexeme = scanner.scan(/[+-][a-zA-Z!$%&*\/:<=>?@^_~+-@][a-zA-Z0-9!$%&*+-.\/:<=>?@^_~+-]*/))

data/lib/skeem/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Skeem
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeem
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Dimitri Geshef
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rley