[GR-45043] Adopt latest changes in Prism

PullRequest: truffleruby/4202

Author: andrykonchin

spec/ruby/language/case_spec.rb

@@ -415,6 +415,19 @@ def test(v)
     self.test("bar").should == false
     self.test(true).should == true
   end
+
+  it "warns if there are identical when clauses" do
+    -> {
+      eval <<~RUBY
+        case 1
+        when 2
+          :foo
+        when 2
+          :bar
+        end
+      RUBY
+    }.should complain(/warning: duplicated .when' clause with line \d+ is ignored/, verbose: true)
+  end
 end
 
 describe "The 'case'-construct with no target expression" do

spec/ruby/language/if_spec.rb

@@ -305,6 +305,15 @@
       6.times(&b)
       ScratchPad.recorded.should == [4, 5, 4, 5]
     end
+
+    it "warns when Integer literals are used instead of predicates" do
+      -> {
+        eval <<~RUBY
+          10.times { |i| ScratchPad << i if 4..5 }
+        RUBY
+      }.should complain(/warning: integer literal in flip-flop/, verbose: true)
+      ScratchPad.recorded.should == []
+    end
   end
 
   describe "when a branch syntactically does not return a value" do

spec/tags/core/warning/warn_tags.txt

@@ -2,4 +2,3 @@ slow:Warning.warn has Warning as the method owner
 slow:Warning.warn can be overridden
 slow:Warning.warn does not add a newline
 slow:Warning.warn returns nil
-fails(https://github.com/ruby/prism/issues/2005):Warning.warn is called by parser warnings

spec/tags/language/if_tags.txt

@@ -0,0 +1 @@
+fails:The if expression with a boolean range ('flip-flop' operator) warns when Integer literals are used instead of predicates

spec/truffle/parsing/fixtures/case/with_expression_and_when/with_splat_operator_and_preceding_and_following_elements.yaml

@@ -103,20 +103,20 @@ ast: |
                                               sourceLength = 0
                                           children:
                                               values = [
-                                                  StringLiteralNode
+                                                  FrozenStringLiteralNode
                                                       attributes:
-                                                          encoding = UTF-8
+                                                          definition = expression
                                                           flags = 0
+                                                          frozenString = bar
                                                           sourceCharIndex = 31
                                                           sourceLength = 5
-                                                          tstring = bar
-                                                  StringLiteralNode
+                                                  FrozenStringLiteralNode
                                                       attributes:
-                                                          encoding = UTF-8
+                                                          definition = expression
                                                           flags = 0
+                                                          frozenString = baz
                                                           sourceCharIndex = 38
                                                           sourceLength = 5
-                                                          tstring = baz
                                               ]
                                   ]
                           ReadLocalVariableNode

spec/truffle/parsing/fixtures/case/with_expression_and_when/with_string_literal_in_when_clause.yaml

@@ -0,0 +1,56 @@
+subject: "case expression"
+description: "with expression to match / and String literal in when clause (case exp when 'string' ... end)"
+notes: >
+  String becomes frozen and is represented as FrozenStringLiteralNode
+focused_on_node: "org.truffleruby.language.control.IfElseNode"
+ruby: |
+  case 42
+  when "foo"
+    true
+  end
+ast: |
+  IfElseNodeGen
+      attributes:
+          flags = 0
+          sourceCharIndex = -1
+          sourceLength = 0
+      children:
+          condition =
+              InlinedCaseEqualNodeGen
+                  attributes:
+                      assumptions = [Assumption(valid, name=set_trace_func is not used)]
+                      flags = 0
+                      integerCaseEqualAssumption = Assumption(valid, name=inlined Integer#===)
+                      parameters = RubyCallNodeParameters{methodName='===', descriptor=NoKeywordArgumentsDescriptor, isSplatted=false, ignoreVisibility=true, isVCall=false, isSafeNavigation=false, isAttrAssign=false}
+                      sourceCharIndex = -1
+                      sourceLength = 0
+                  children:
+                      leftNode_ =
+                          FrozenStringLiteralNode
+                              attributes:
+                                  definition = expression
+                                  flags = 0
+                                  frozenString = foo
+                                  sourceCharIndex = 13
+                                  sourceLength = 5
+                      rightNode_ =
+                          ReadLocalVariableNode
+                              attributes:
+                                  flags = 0
+                                  frameSlot = 2 # %case_0
+                                  sourceCharIndex = -1
+                                  sourceLength = 0
+                                  type = FRAME_LOCAL
+          elseBody =
+              NilLiteralNode
+                  attributes:
+                      flags = 0
+                      sourceCharIndex = -1
+                      sourceLength = 0
+          thenBody =
+              BooleanLiteralNode
+                  attributes:
+                      flags = 1
+                      sourceCharIndex = 21
+                      sourceLength = 4
+                      value = true

spec/truffle/parsing/fixtures/case/without_expression_and_when/with_string_literal_in_when_clause.yaml

@@ -0,0 +1,38 @@
+subject: "case expression"
+description: "without expression to match / and String literal in when clause (case exp when 'string' ... end)"
+notes: >
+  String becomes frozen and is represented as FrozenStringLiteralNode
+focused_on_node: "org.truffleruby.language.control.IfElseNode"
+ruby: |
+  case
+  when "foo"
+    true
+  end
+ast: |
+  IfElseNodeGen
+      attributes:
+          flags = 1
+          sourceCharIndex = 0
+          sourceLength = 26
+      children:
+          condition =
+              FrozenStringLiteralNode
+                  attributes:
+                      definition = expression
+                      flags = 0
+                      frozenString = foo
+                      sourceCharIndex = 10
+                      sourceLength = 5
+          elseBody =
+              NilLiteralNode
+                  attributes:
+                      flags = 0
+                      sourceCharIndex = -1
+                      sourceLength = 0
+          thenBody =
+              BooleanLiteralNode
+                  attributes:
+                      flags = 1
+                      sourceCharIndex = 18
+                      sourceLength = 4
+                      value = true

src/main/c/yarp/include/prism.h

@@ -21,6 +21,7 @@
 #include "prism/parser.h"
 #include "prism/prettyprint.h"
 #include "prism/regexp.h"
+#include "prism/static_literals.h"
 #include "prism/version.h"
 
 #include <assert.h>

src/main/c/yarp/include/prism/ast.h

@@ -5,6 +5,7 @@
 /* if you are looking to modify the                                           */
 /* template                                                                   */
 /******************************************************************************/
+
 /**
  * @file ast.h
  *

src/main/c/yarp/include/prism/diagnostic.h

@@ -306,7 +306,10 @@ typedef enum {
     PM_WARN_AMBIGUOUS_SLASH,
     PM_WARN_EQUAL_IN_CONDITIONAL,
     PM_WARN_END_IN_METHOD,
+    PM_WARN_DUPLICATED_HASH_KEY,
+    PM_WARN_DUPLICATED_WHEN_CLAUSE,
     PM_WARN_FLOAT_OUT_OF_RANGE,
+    PM_WARN_INTEGER_IN_FLIP_FLOP,
 
     // This is the number of diagnostic codes.
     PM_DIAGNOSTIC_ID_LEN,