Skip to content
This repository was archived by the owner on May 9, 2026. It is now read-only.

2024 workshop - welcome map with string to any key value pairs #8

Open
viqueen wants to merge 4 commits into
base: workshop/2024-map-with-string-key-value-pairs
Choose a base branch
from
Open

2024 workshop - welcome map with string to any key value pairs #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a118d7
welcome string to any key value pairs map
viqueen Feb 5, 2024
a66c3d3
fix the timeout issue, ps: explain why later
viqueen Feb 5, 2024
5102f27
Merge remote-tracking branch 'origin/workshop/2024-map-with-string-ke…
viqueen Oct 6, 2024
6373821
whoops, I need the bug to be there
viqueen Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,8 +2759,7 @@ private JCExpression mapEntry(int pos) {
String key = token.stringVal();
accept(STRINGLITERAL);
accept(COLON);
String value = token.stringVal();
accept(STRINGLITERAL);
JCExpression value = parseExpression();
return F.at(pos).StringMapEntry(key, value);
} else {
return illegal(pos);
Expand Down
4 changes: 2 additions & 2 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,12 +446,12 @@ public JCExpression NewMap(List<JCExpression> entries) {
return invocation;
}

public JCExpression StringMapEntry(String key, String value) {
public JCExpression StringMapEntry(String key, JCExpression value) {
JCFieldAccess util = new JCFieldAccess(Ident(names.fromString("java")), names.fromString("util"), null);
JCFieldAccess map = new JCFieldAccess(util, names.fromString("Map"), null);
JCFieldAccess entry = new JCFieldAccess(map, names.fromString("entry"), null);

JCMethodInvocation invocation = new JCMethodInvocation(List.nil(), entry, List.of(Literal(key), Literal(value)));
JCMethodInvocation invocation = new JCMethodInvocation(List.nil(), entry, List.of(Literal(key), value));
invocation.pos = pos;

return invocation;
Expand Down