Merge branch 'master' into optimize-enum-parse

Author: jgaskins

.github/workflows/win.yml

@@ -10,7 +10,7 @@ concurrency:
 
 env:
   SPEC_SPLIT_DOTS: 160
-  CI_LLVM_VERSION: "19.1.7"
+  CI_LLVM_VERSION: "20.1.7"
   CI_LLVM_TARGETS: "X86,AArch64"
   CI_LLVM_LDFLAGS: "psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib ws2_32.lib ntdll.lib"
 
@@ -64,7 +64,7 @@ jobs:
         run: .\etc\win-ci\build-iconv.ps1 -BuildTree deps\iconv -Version 1.18
       - name: Build libffi
         if: steps.cache-libs.outputs.cache-hit != 'true'
-        run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.4.7
+        run: .\etc\win-ci\build-ffi.ps1 -BuildTree deps\ffi -Version 3.5.1
       - name: Build zlib
         if: steps.cache-libs.outputs.cache-hit != 'true'
         run: .\etc\win-ci\build-z.ps1 -BuildTree deps\z -Version 1.3.1
@@ -76,7 +76,7 @@ jobs:
         run: .\etc\win-ci\build-yaml.ps1 -BuildTree deps\yaml -Version 0.2.5
       - name: Build libxml2
         if: steps.cache-libs.outputs.cache-hit != 'true'
-        run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.6
+        run: .\etc\win-ci\build-xml2.ps1 -BuildTree deps\xml2 -Version 2.13.8
 
       - name: Cache OpenSSL
         id: cache-openssl
@@ -92,7 +92,7 @@ jobs:
         uses: ilammy/setup-nasm@72793074d3c8cdda771dba85f6deafe00623038b # v1.5.2
       - name: Build OpenSSL
         if: steps.cache-openssl.outputs.cache-hit != 'true'
-        run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.4.1
+        run: .\etc\win-ci\build-openssl.ps1 -BuildTree deps\openssl -Version 3.5.0
 
   x86_64-windows-dlls:
     runs-on: windows-2025
@@ -214,7 +214,7 @@ jobs:
     uses: ./.github/workflows/win_build_portable.yml
     with:
       release: true
-      llvm_version: "19.1.7"
+      llvm_version: "20.1.7"
       llvm_targets: "X86,AArch64"
       llvm_ldflags: "psapi.lib shell32.lib ole32.lib uuid.lib advapi32.lib ws2_32.lib ntdll.lib"
 

spec/compiler/normalize/case_spec.cr

@@ -2,7 +2,7 @@ require "../../spec_helper"
 
 describe "Normalize: case" do
   it "normalizes case with call" do
-    assert_expand "case x; when 1; 'b'; when 2; 'c'; else; 'd'; end", "__temp_1 = x\nif 1 === __temp_1\n  'b'\nelse\n  if 2 === __temp_1\n    'c'\n  else\n    'd'\n  end\nend"
+    assert_expand "case x; when 1; 'b'; when 2; 'c'; else; 'd'; end", "__temp_1 = x\nif 1 === __temp_1\n  'b'\nelsif 2 === __temp_1\n  'c'\nelse\n  'd'\nend"
   end
 
   it "normalizes case with var in cond" do
@@ -62,11 +62,11 @@ describe "Normalize: case" do
   end
 
   it "normalizes case without value" do
-    assert_expand "case when 2; 3; when 4; 5; end", "if 2\n  3\nelse\n  if 4\n    5\n  end\nend"
+    assert_expand "case when 2; 3; when 4; 5; end", "if 2\n  3\nelsif 4\n  5\nend"
   end
 
   it "normalizes case without value with many expressions in when" do
-    assert_expand "case when 2, 9; 3; when 4; 5; end", "if 2 || 9\n  3\nelse\n  if 4\n    5\n  end\nend"
+    assert_expand "case when 2, 9; 3; when 4; 5; end", "if 2 || 9\n  3\nelsif 4\n  5\nend"
   end
 
   it "normalizes case with nil to is_a?" do

spec/compiler/parser/parser_spec.cr

@@ -1271,6 +1271,19 @@ module Crystal
     assert_syntax_error "{% unless 1; 2; elsif 3; 4; end %}"
     assert_syntax_error "{% unless 1 %} 2 {% elsif 3 %} 3 {% end %}"
 
+    it_parses "{% if 1; 2; end; %}", MacroExpression.new(If.new(1.int32, 2.int32), output: false)
+    it_parses "{% if 1; 2; end; 3 %}", MacroExpression.new(Expressions.new([If.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{%\nif 1; 2; end; 3\n%}", MacroExpression.new(Expressions.new([If.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{% 2 if 1; 3 %}", MacroExpression.new(Expressions.new([If.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{%\n2 if 1; 3\n%}", MacroExpression.new(Expressions.new([If.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{% if 1; 2; elsif 3; 4; else; 5; end; 6 %}", MacroExpression.new(Expressions.new([If.new(1.int32, 2.int32, If.new(3.int32, 4.int32, 5.int32)), 6.int32]), output: false)
+
+    it_parses "{% unless 1; 2; end; %}", MacroExpression.new(Unless.new(1.int32, 2.int32), output: false)
+    it_parses "{% unless 1; 2; end; 3 %}", MacroExpression.new(Expressions.new([Unless.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{%\nunless 1; 2; end; 3\n%}", MacroExpression.new(Expressions.new([Unless.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{% 2 unless 1; 3 %}", MacroExpression.new(Expressions.new([Unless.new(1.int32, 2.int32), 3.int32]), output: false)
+    it_parses "{%\n2 unless 1; 3\n%}", MacroExpression.new(Expressions.new([Unless.new(1.int32, 2.int32), 3.int32]), output: false)
+
     it_parses "{{ 1 // 2 }}", MacroExpression.new(Expressions.from([Call.new(1.int32, "//", 2.int32)] of ASTNode))
     it_parses "{{ //.options }}", MacroExpression.new(Expressions.from([Call.new(RegexLiteral.new(StringLiteral.new("")), "options")] of ASTNode))
 

spec/compiler/parser/to_s_spec.cr

@@ -63,6 +63,8 @@ describe "ASTNode#to_s" do
   expect_to_s %({{ foo }})
   expect_to_s %({% if foo %}\n  foo_then\n{% end %})
   expect_to_s %({% if foo %}\n  foo_then\n{% else %}\n  foo_else\n{% end %})
+  expect_to_s %({% unless foo %}\n  foo_then\n{% end %})
+  expect_to_s %({% unless foo %}\n  foo_then\n{% else %}\n  foo_else\n{% end %})
   expect_to_s %({% for foo in bar %}\n  {{ foo }}\n{% end %})
   expect_to_s %(macro foo\n  {% for foo in bar %}\n    {{ foo }}\n  {% end %}\nend)
   expect_to_s %[1.as(Int32)]
@@ -229,6 +231,59 @@ describe "ASTNode#to_s" do
   expect_to_s %(begin\n  (@x = x).is_a?(Foo)\nend)
   expect_to_s %(begin\n  (1)\n  2\nend)
   expect_to_s %(if 1\n  begin\n    2\n  end\nelse\n  begin\n    3\n  end\nend)
+
+  expect_to_s <<-CRYSTAL
+    if 1
+      2
+    elsif 3
+      4
+    elsif 5
+    elsif 6
+    else
+      7
+    end
+    CRYSTAL
+
+  expect_to_s <<-CRYSTAL, <<-CRYSTAL
+    if 1
+      2
+    else
+      if 3
+      end
+    end
+    CRYSTAL
+    if 1
+      2
+    elsif 3
+    end
+    CRYSTAL
+
+  expect_to_s <<-CRYSTAL
+    if 1
+      2
+    else
+      unless 3
+      end
+    end
+    CRYSTAL
+
+  expect_to_s <<-CRYSTAL
+    if 1
+      2
+    else
+      3 ? 4 : 5
+    end
+    CRYSTAL
+
+  expect_to_s <<-CRYSTAL
+    unless 1
+      2
+    else
+      if 3
+      end
+    end
+    CRYSTAL
+
   expect_to_s %(foo do\n  begin\n    bar\n  end\nend)
   expect_to_s %q("\e\0\""), %q("\e\u0000\"")
   expect_to_s %q("#{1}\0"), %q("#{1}\u0000")
@@ -291,6 +346,25 @@ describe "ASTNode#to_s" do
   expect_to_s "{%\n  a = 1 %}"
   expect_to_s "{% a = 1\n%}"
 
+  expect_to_s <<-'CRYSTAL'
+    {%
+      if 1
+        2
+      end
+      3
+    %}
+    CRYSTAL
+
+  expect_to_s <<-'CRYSTAL'
+    {%
+      if 1
+        2
+      end
+      3
+      4
+    %}
+    CRYSTAL
+
   expect_to_s <<-'CR', <<-'CR'
     macro finished
       {% verbatim do %}

src/compiler/crystal/syntax/ast.cr

@@ -150,6 +150,30 @@ module Crystal
       obj
     end
 
+    # Concatenates two AST nodes into a single `Expressions` node, removing
+    # `Nop`s and merging keyword-less expressions into a single node.
+    #
+    # *x* and *y* may be modified in-place if they are already `Expressions`
+    # nodes.
+    def self.concat!(x : ASTNode, y : ASTNode) : ASTNode
+      return x if y.is_a?(Nop)
+      return y if x.is_a?(Nop)
+
+      if x.is_a?(Expressions) && x.keyword.none?
+        if y.is_a?(Expressions) && y.keyword.none?
+          x.expressions.concat(y.expressions)
+        else
+          x.expressions << y
+        end
+        x.at_end(y.end_location)
+      elsif y.is_a?(Expressions) && y.keyword.none?
+        y.expressions.unshift(x)
+        y.at(x.location)
+      else
+        Expressions.new([x, y] of ASTNode).at(x.location).at_end(y.end_location)
+      end
+    end
+
     def initialize(@expressions = [] of ASTNode)
     end
 

src/compiler/crystal/syntax/parser.cr

@@ -3477,10 +3477,13 @@ module Crystal
         else
           node = parse_if_after_condition cond, location, true
         end
+        skip_statement_end
+        exps = parse_expressions
         @in_macro_expression = false
-        skip_space_or_newline
         check :OP_PERCENT_RCURLY
-        return MacroExpression.new(node, output: false).at_end(token_end_location)
+
+        exps = Expressions.concat!(node, exps)
+        return MacroExpression.new(exps, output: false).at_end(token_end_location)
       end
 
       check :OP_PERCENT_RCURLY

src/compiler/crystal/syntax/to_s.cr

@@ -334,16 +334,35 @@ module Crystal
         return false
       end
 
-      visit_if_or_unless "if", node
-    end
+      while true
+        @str << "if "
+        node.cond.accept self
+        newline
+        accept_with_indent(node.then)
+        append_indent
 
-    def visit(node : Unless)
-      visit_if_or_unless "unless", node
+        # combine `else if` into `elsif` (does not apply to `unless` or `? :`)
+        if (else_node = node.else).is_a?(If) && !else_node.ternary?
+          @str << "els"
+          node = else_node
+        else
+          break
+        end
+      end
+
+      unless else_node.nop?
+        @str << "else"
+        newline
+        accept_with_indent(node.else)
+        append_indent
+      end
+
+      @str << "end"
+      false
     end
 
-    def visit_if_or_unless(prefix, node)
-      @str << prefix
-      @str << ' '
+    def visit(node : Unless)
+      @str << "unless "
       node.cond.accept self
       newline
       accept_with_indent(node.then)
@@ -885,18 +904,29 @@ module Crystal
     end
 
     def visit(node : MacroIf)
-      @str << "{% if "
+      if node.is_unless?
+        @str << "{% unless "
+        then_node = node.else
+        else_node = node.then
+      else
+        @str << "{% if "
+        then_node = node.then
+        else_node = node.else
+      end
       node.cond.accept self
       @str << " %}"
+
       inside_macro do
-        node.then.accept self
+        then_node.accept self
       end
-      unless node.else.nop?
+
+      unless else_node.nop?
         @str << "{% else %}"
         inside_macro do
-          node.else.accept self
+          else_node.accept self
         end
       end
+
       @str << "{% end %}"
       false
     end