skeem 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec02d8c62bd2fa45f27d50caa7a63edb88ad8629f8e627538d0119fe1950a8d4
-  data.tar.gz: 9e69db52280935a6d2548350df11744776755201030ed892d1c675717afc0411
+  metadata.gz: 8031a69d8a362bbe17e4dabe5fb6ced12ff4ca70f2d6577f5ec13ff81b8bd3ad
+  data.tar.gz: 17f74953cc15cd97d84ede36c17f9d4e97873710d8c94ecfdb50e76019cf3bd2
 SHA512:
-  metadata.gz: 5f5bf56b406239eb4231dd5368fd26ee024f88d8809c777df381db9de65a5b1cf89c3fc138d8cd896fbad8d5407be165d124de08713bce9b9ff926140d123a1b
-  data.tar.gz: 0ae82878f00bb53b82679a9d6d838bace130e8a4b1f218fbb25d64c0d9fc67b302f5de1b90ca1e451ca4e406c48db7a6080d8d2f8785e9bae86c544f0643839e
+  metadata.gz: 65521fe50624af6e01bacb890ae3b1ddf9f6acb5a1a3a31fd5cfb1b20143101c0aad531a1f3773b50585a6bed8a18380897f47786ecfdc3c53140e7686e17876
+  data.tar.gz: 3a5d8cac363099882da772135498df5c24449eedc6831a2fe09f840764afd12d22ad4fa74589dd92309875407cf77a334fc704d6914a93988debfd65b31a2d35

data/.rubocop.yml

@@ -2,6 +2,16 @@ AllCops:
   Exclude:
     - 'exp/**/*'
 
+Gemspec/DateAssignment:
+  Enabled: true
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Layout/ArrayAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
 Layout/CaseIndentation:
   Enabled: false
 
@@ -24,6 +34,12 @@ Layout/EndOfLine:
   Enabled: true
   EnforcedStyle: lf
 
+Layout/FirstArgumentIndentation:
+  Enabled: false
+
+Layout/HashAlignment:
+  Enabled: false
+
 Layout/IndentationWidth:
   Enabled: false
 
@@ -33,18 +49,28 @@ Layout/IndentationConsistency:
 Layout/HeredocIndentation:
   Enabled: false
 
+Layout/LineEndStringConcatenationIndentation:
+  Enabled: true
+
 Layout/MultilineHashBraceLayout:
   Enabled: true
 
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: true
+  EnforcedStyle: same_line
+
 Layout/SpaceAroundOperators:
   Enabled: true
 
+Layout/SpaceBeforeBrackets:
+  Enabled: true
+
 Layout/SpaceInsideParens:
   Enabled: true
 
 Layout/IndentationStyle:
   Enabled: true
-  
+
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 
@@ -54,18 +80,72 @@ Layout/TrailingEmptyLines:
 Layout/TrailingWhitespace:
   Enabled: true
 
+Lint/AmbiguousAssignment:
+  Enabled: true
+
+Lint/AmbiguousRange:
+  Enabled: true
+
+Lint/DeprecatedConstants:
+  Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: true
+
+Lint/DuplicateRegexpCharacterClassElement:
+  Enabled: true
+
+Lint/EmptyBlock:
+  Enabled: true
+
+Lint/EmptyClass:
+  Enabled: false
+
+Lint/EmptyInPattern:
+  Enabled: true
+
+Lint/LambdaWithoutLiteralBlock:
+  Enabled: true
+
 Lint/Loop:
   Enabled: true
-  
+
+Lint/NoReturnInBeginEndBlocks:
+  Enabled: true
+
+Lint/NumberedParameterAssignment:
+  Enabled: true
+
+Lint/OrAssignmentToConstant:
+  Enabled: true
+
 Lint/RaiseException:
   Enabled: true
 
+Lint/RedundantDirGlobSort:
+  Enabled: true
+
 Lint/RescueException:
   Enabled: true
-  
+
 Lint/StructNewOverride:
   Enabled: true
 
+Lint/SymbolConversion:
+  Enabled: true
+
+Lint/ToEnumArguments:
+  Enabled: true
+
+Lint/TripleQuotes:
+  Enabled: true
+
+Lint/UnexpectedBlockArity:
+  Enabled: true
+
+Lint/UnmodifiedReduceAccumulator:
+  Enabled: true
+
 Lint/UnusedMethodArgument:
   Enabled: true
 
@@ -85,9 +165,13 @@ Metrics/BlockLength:
   Enabled: true
   Max: 350
 
+Metrics/BlockNesting:
+  Enabled: true
+  Max: 5
+
 Metrics/ClassLength:
   Enabled: true
-  Max: 350
+  Max: 450
 
 Metrics/CyclomaticComplexity:
   Enabled: false
@@ -98,7 +182,7 @@ Layout/LineLength:
 
 Metrics/MethodLength:
   Enabled: true
-  Max: 45
+  Max: 60
 
 Metrics/ModuleLength:
   Enabled: true
@@ -116,17 +200,26 @@ Naming/ClassAndModuleCamelCase:
 Naming/BlockParameterName:
   Enabled: true
 
+Naming/InclusiveLanguage:
+  Enabled: true
+
 Naming/MethodParameterName:
   Enabled: false
 
+Naming/MethodName:
+  Enabled: false
+
 Naming/VariableName:
   Enabled: false
 
+Style/AccessorGrouping:
+  Enabled: false
+
 Style/Alias:
   Enabled: true
 
-Layout/HashAlignment:
-  Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: true
 
 Style/AsciiComments:
   Enabled: false
@@ -146,6 +239,9 @@ Style/ClassCheck:
 Style/ClassVars:
   Enabled: false
 
+Style/CollectionCompact:
+  Enabled: true
+
 Style/ColonMethodCall:
   Enabled: false
 
@@ -164,46 +260,75 @@ Style/DefWithParentheses:
 Style/Documentation:
   Enabled: false
 
+Style/DocumentDynamicEvalDefinition:
+  Enabled: false
+
 Style/ExpandPathArguments:
   Enabled: false
-  
+
 Style/ExponentialNotation:
   Enabled: true
 
 Style/GuardClause:
   Enabled: false
-  
+
 Style/HashEachMethods:
   Enabled: true
-  
+
+Style/HashExcept:
+  Enabled: true
+
 Style/HashTransformKeys:
   Enabled: true
-  
+
 Style/HashTransformValues:
   Enabled: true
 
-
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/InPatternThen:
+  Enabled: true
+
 Style/InverseMethods:
+  Enabled: false
+
+Style/MissingRespondToMissing:
+  Enabled: false
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/NegatedIfElseCondition:
   Enabled: true
 
 Style/Next:
   Enabled: false
 
+Style/NilLambda:
+  Enabled: true
+
 Style/NumericLiterals:
   Enabled: false
 
+Style/QuotedSymbols:
+  Enabled: true
+
 Style/RaiseArgs:
   Enabled: true
 
+Style/RedundantArgument:
+  Enabled: true
+
 Style/RedundantReturn:
   Enabled: false
 
 Style/RedundantSelf:
   Enabled: true
 
+Style/RedundantSelfAssignmentBranch:
+  Enabled: true
+
 Style/RegexpLiteral:
   Enabled: false
 
@@ -216,8 +341,111 @@ Style/StderrPuts:
 Style/StringLiterals:
   Enabled: true
 
+Style/SwapValues:
+  Enabled: true
+
 Style/TernaryParentheses:
   Enabled: false
 
 Style/UnlessElse:
-  Enabled: false
+  Enabled: false
+
+# Rubocop complains when it doesn't find an explicit setting for the following cops:
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+
+Lint/BinaryOperatorWithIdenticalOperands:
+  Enabled: true
+
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+
+Lint/DuplicateElsifCondition:
+  Enabled: true
+
+Lint/DuplicateRescueException:
+  Enabled: true
+
+Lint/EmptyConditionalBody:
+  Enabled: true
+
+Lint/FloatComparison:
+  Enabled: true
+
+Lint/MissingSuper:
+  Enabled: true
+
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
+
+Lint/OutOfRangeRegexpRef:
+  Enabled: true
+
+Lint/SelfAssignment:
+  Enabled: true
+
+Lint/TopLevelReturnWithArgument:
+  Enabled: true
+
+Lint/UnreachableLoop:
+  Enabled: true
+
+Style/ArrayCoercion:
+  Enabled: true
+
+Style/BisectedAttrAccessor:
+  Enabled: true
+
+Style/CaseLikeIf:
+  Enabled: true
+
+Style/EndlessMethod:
+  Enabled: true
+
+Style/ExplicitBlockArgument:
+  Enabled: true
+
+Style/GlobalStdStream:
+  Enabled: true
+
+Style/HashAsLastArrayItem:
+  Enabled: true
+
+Style/HashConversion:
+  Enabled: true
+
+Style/HashLikeCase:
+  Enabled: true
+
+Style/IfWithBooleanLiteralBranches:
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Enabled: true
+
+Style/RedundantAssignment:
+  Enabled: true
+
+Style/RedundantFetchBlock:
+  Enabled: true
+
+Style/RedundantFileExtensionInRequire:
+  Enabled: true
+
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+
+Style/RedundantRegexpEscape:
+  Enabled: true
+
+Style/SingleArgumentDig:
+  Enabled: true
+
+Style/SlicingWithRange:
+  Enabled: true
+
+Style/StringChars:
+  Enabled: true
+
+Style/StringConcatenation:
+  Enabled: true

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.2.18] - 2021-08-29
+- Minor refactoring for Rley 0.8.03
+- Code restyling to please rubocop 1.19.1.
+
+### Changed
+- File `.rubocop.yml` updated with newer Rubocop cops
+- File `grammar.rb`: Calling `Rley::grammar_builder`, replace `LET*` token by `LET_STAR`
+- Other files changed to get rid of Rubocop offences
+
 ## [0.2.17] - 2020-05-09
 - Updated `.rubocop.yml` file. 
 - Code restyling to please rubocop 0.8.0. 

data/bin/skeem

@@ -25,10 +25,10 @@ class SkeemREPL
     if File.exist?(aFilename)
       valid_fname = aFilename
     elsif File.extname(aFilename).empty? # Retry by adding extension...
-      if File.exist?(aFilename + '.skm')
-        valid_fname = aFilename + '.skm'
-      elsif File.exist?(aFilename + '.scm')
-        valid_fname = aFilename + '.scm'
+      if File.exist?("#{aFilename}.skm")
+        valid_fname = "#{aFilename}.skm"
+      elsif File.exist?("#{aFilename}.scm")
+        valid_fname = "#{aFilename}.scm"
       else
         valid_fname = nil
       end

data/lib/skeem/datum_dsl.rb

@@ -11,7 +11,7 @@ module Skeem
     def boolean(aBoolean)
       return aBoolean if aBoolean.kind_of?(SkmBoolean)
 
-      result = case aBoolean
+      case aBoolean
         when TrueClass, FalseClass
           SkmBoolean.create(aBoolean)
         when /^#t(?:rue)?|true$/
@@ -21,13 +21,12 @@ module Skeem
         else
           raise StandardError, aBoolean.inspect
       end
-      result
     end
 
     def integer(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmInteger)
 
-      result = case aLiteral
+      case aLiteral
         when Integer
           SkmInteger.create(aLiteral)
         when /^[+-]?\d+$/
@@ -35,13 +34,12 @@ module Skeem
         else
           raise StandardError, aLiteral.inspect
       end
-      result
     end
 
     def rational(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmRational)
 
-      result = case aLiteral
+      case aLiteral
         when Rational
           SkmRational.create(aLiteral)
         when /^[+-]?\d+\/\d+$/
@@ -49,13 +47,12 @@ module Skeem
         else
           raise StandardError, aLiteral.inspect
       end
-      result
     end
 
     def real(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmReal)
 
-      result = case aLiteral
+      case aLiteral
         when Numeric
           SkmReal.create(aLiteral)
         when /^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?$/
@@ -63,13 +60,12 @@ module Skeem
         else
           raise StandardError, aLiteral.inspect
       end
-      result
     end
 
     def char(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmChar)
 
-      result = case aLiteral
+      case aLiteral
         when Numeric
           SkmChar.create_from_int(aLiteral)
         when String
@@ -81,13 +77,12 @@ module Skeem
         else
           raise StandardError, aLiteral.inspect
       end
-      result
     end
 
     def string(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmString)
 
-      result = case aLiteral
+      case aLiteral
         when String
           SkmString.create(aLiteral)
         when SkmIdentifier
@@ -95,13 +90,12 @@ module Skeem
         else
           SkmString.create(aLiteral.to_s)
       end
-      result
     end
 
     def identifier(aLiteral)
       return aLiteral if aLiteral.kind_of?(SkmIdentifier)
 
-      result = case aLiteral
+      case aLiteral
         when String
           SkmIdentifier.create(aLiteral)
         when SkmString
@@ -109,13 +103,12 @@ module Skeem
         else
           raise StandardError, aLiteral.inspect
       end
-      result
     end
 
     alias symbol identifier
 
     def list(aLiteral)
-      result = case aLiteral
+      case aLiteral
         when Array
           SkmPair.create_from_a(to_datum(aLiteral))
         when SkmPair
@@ -123,12 +116,10 @@ module Skeem
         else
           SkmPair.new(to_datum(aLiteral), SkmEmptyList.instance)
         end
-
-      result
     end
 
     def vector(aLiteral)
-      result = case aLiteral
+      case aLiteral
         when Array
           SkmVector.new(to_datum(aLiteral))
         when SkmVector
@@ -136,8 +127,6 @@ module Skeem
         else
           SkmVector.new([to_datum(aLiteral)])
         end
-
-      result
     end
 
     # Conversion from Ruby object value to Skeem datum
@@ -146,7 +135,7 @@ module Skeem
       return vector(aLiteral.members) if aLiteral.kind_of?(SkmVector)
       return aLiteral if aLiteral.kind_of?(Primitive::PrimitiveProcedure)
 
-      result = case aLiteral
+      case aLiteral
         when Array
           aLiteral.map { |elem| to_datum(elem) }
         when Integer
@@ -166,25 +155,37 @@ module Skeem
           aLiteral
         else
           raise StandardError, aLiteral.inspect
-        end
-      result
+      end
     end
 
     private
 
     def parse_literal(aLiteral)
-      if aLiteral =~ /^#t(?:rue)?|true$/
-        boolean(aLiteral)
-      elsif aLiteral =~ /^#f(?:alse)?|false$/
-        boolean(aLiteral)
-      elsif aLiteral =~ /^[+-]?\d+\/\d+$/
-        rational(aLiteral)
-      elsif aLiteral =~ /^[+-]?\d+$/
-        integer(aLiteral)
-      elsif aLiteral =~ /^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?$/
-        real(aLiteral)
-      else
-        string(aLiteral)
+      # if aLiteral =~ /^#t(?:rue)?|true$/
+        # boolean(aLiteral)
+      # elsif aLiteral =~ /^#f(?:alse)?|false$/
+        # boolean(aLiteral)
+      # elsif aLiteral =~ /^[+-]?\d+\/\d+$/
+        # rational(aLiteral)
+      # elsif aLiteral =~ /^[+-]?\d+$/
+        # integer(aLiteral)
+      # elsif aLiteral =~ /^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?$/
+        # real(aLiteral)
+      # else
+        # string(aLiteral)
+      # end
+
+      case aLiteral
+        when /^#t(?:rue)?|true$/, /^#f(?:alse)?|false$/
+          boolean(aLiteral)
+        when /^[+-]?\d+\/\d+$/
+          rational(aLiteral)
+        when /^[+-]?\d+$/
+          integer(aLiteral)
+        when /^[+-]?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?$/
+          real(aLiteral)
+        else
+          string(aLiteral)
       end
     end
   end # module