Begin Work on Removing Lombok Dep From Project

This is a massive annoyance as I never should've had a lombok dep in the first place. It was worth experimenting with but didn't turn out to be particularly useful to me. I'm particularly removing this now because after the migration to the latest Bazel version I suddenly need to use the --nojava_header_compilation flag on all of my bazel build/run commands simply because Lombok has some obnoxious failure mode w/o it. Lombok's not fully removed in this CL but this required a ton of manual refactoring so I'm checking this in now.

.bazelversion

@@ -0,0 +1 @@
+6.2.1

src/java/com/claro/ClaroLexer.flex

@@ -51,7 +51,7 @@ import java.util.concurrent.atomic.AtomicReference;
  private <T> Symbol symbol(int type, int lines, int columns, T value) {
  addToLine(value);
  final StringBuilder currentInputLineBuilder = currentInputLine.get();
- Symbol res = new Symbol(type, yycolumn, yyline, new LexedValue<T>(value, () -> currentInputLineBuilder.toString(), columns));
+ Symbol res = new Symbol(type, yycolumn, yyline, LexedValue.create(value, () -> currentInputLineBuilder.toString(), columns));
  yyline += lines;
  yycolumn += columns;
  return res;
@@ -338,7 +338,7 @@ PrivilegedInlineJava = [^]*\$\$END_JAVA
  string.setLength(0);
  addToLine("\"");
  final StringBuilder currentInputLineBuilder = currentInputLine.get();
- return new Symbol(Tokens.STRING, ++yycolumn - matchedString.length() - 2 , yyline, new LexedValue(matchedString, () -> currentInputLineBuilder.toString(), matchedString.length() + 2));
+ return new Symbol(Tokens.STRING, ++yycolumn - matchedString.length() - 2 , yyline, LexedValue.create(matchedString, () -> currentInputLineBuilder.toString(), matchedString.length() + 2));
  }
  [^\n\r\"\\{]+ {
  String parsed = yytext();
@@ -368,7 +368,7 @@ PrivilegedInlineJava = [^]*\$\$END_JAVA
  yycolumn++;
  addToLine("{");
  final StringBuilder currentInputLineBuilder = currentInputLine.get();
- return new Symbol(Tokens.FMT_STRING_PART, yycolumn, yyline, new LexedValue<String>(fmtStringPart, () -> currentInputLineBuilder.toString(), fmtStringPart.length() + 1));
+ return new Symbol(Tokens.FMT_STRING_PART, yycolumn, yyline, LexedValue.create(fmtStringPart, () -> currentInputLineBuilder.toString(), fmtStringPart.length() + 1));
  }
 }
 

src/java/com/claro/LexedValue.java

@@ -1,14 +1,18 @@
 package com.claro;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import com.google.auto.value.AutoValue;
 
 import java.util.function.Supplier;
 
-@Data
-@AllArgsConstructor
-public class LexedValue<T> {
- public final T val;
- public final Supplier<String> currentInputLine;
- public final int len;
+@AutoValue
+public abstract class LexedValue<T> {
+ public abstract T getVal();
+
+ public abstract Supplier<String> getCurrentInputLine();
+
+ public abstract int getLen();
+
+ public static <T> LexedValue<T> create(T val, Supplier<String> currentInputLine, int len) {
+ return new AutoValue_LexedValue<>(val, currentInputLine, len);
+ }
 }

src/java/com/claro/claro_build_rules.bzl

@@ -106,7 +106,7 @@ def claro_library(name, src, module_api_file = None, java_name = None, claro_com
  DEFAULT_PACKAGE_PREFIX, # --package
  # Here, construct a totally unique name for this particular module. Since we're using Bazel, I have the
  # guarantee that this RULEDIR+target name is globally unique across the entire project.
- "--unique_module_name=$$(echo $(RULEDIR) | cut -c $$(($$(echo $(GENDIR) | wc -c ) - 1))- | tr '/' '$$')\$$" + name if isModule else ""
+ "--unique_module_name=$$(echo $(RULEDIR) | cut -c $$(($$(echo $(GENDIR) | wc -c ) - 1))- | tr '/' '$$')\\$$" + name if isModule else ""
  ),
  toolchains = ["@bazel_tools//tools/jdk:current_java_runtime"], # Gives the above cmd access to $(JAVA).
  tools = [
@@ -199,6 +199,6 @@ def gen_claro_compiler(name = DEFAULT_CLARO_NAME):
  name = "lexed_value",
  srcs = ["LexedValue.java"],
  deps = [
- "//:lombok",
+ "//:autovalue",
  ],
  )

src/java/com/claro/intermediate_representation/statements/ConsumerFunctionDefinitionStmt.java

@@ -48,7 +48,8 @@ public ConsumerFunctionDefinitionStmt(
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),

src/java/com/claro/intermediate_representation/statements/FunctionDefinitionStmt.java

@@ -79,7 +79,8 @@ public FunctionDefinitionStmt(
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),

src/java/com/claro/intermediate_representation/statements/GenericFunctionDefinitionStmt.java

@@ -284,7 +284,8 @@ private ProcedureDefinitionStmt generateProcedureDefStmt(String canonicalProcedu
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),
@@ -319,7 +320,8 @@ private ProcedureDefinitionStmt generateProcedureDefStmt(String canonicalProcedu
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),
@@ -355,7 +357,8 @@ private ProcedureDefinitionStmt generateProcedureDefStmt(String canonicalProcedu
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),

src/java/com/claro/intermediate_representation/statements/ProcedureDefinitionStmt.java

@@ -140,8 +140,8 @@ public void registerProcedureTypeProvider(ScopedHeap scopedHeap) {
  .collect(
  ImmutableMap.toImmutableMap(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)),
- injectedKey -> injectedKey.optionalAlias
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider().resolveType(scopedHeap)),
+ injectedKey -> injectedKey.getOptionalAlias()
  )));
 
  // Validate that this is not a redeclaration of an identifier.

src/java/com/claro/intermediate_representation/statements/ProviderFunctionDefinitionStmt.java

@@ -41,7 +41,8 @@ public ProviderFunctionDefinitionStmt(
  injectedKeysTypes.stream()
  .map(
  injectedKey ->
- new Key(injectedKey.name, injectedKey.typeProvider.resolveType(scopedHeap)))
+ new Key(injectedKey.getName(), injectedKey.getTypeProvider()
+ .resolveType(scopedHeap)))
  .collect(Collectors.toSet())
  )
  .orElse(Sets.newHashSet()),

src/java/com/claro/module_system/ModuleApiLexer.flex

@@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicReference;
  private <T> Symbol symbol(int type, int lines, int columns, T value) {
  addToLine(value);
  final StringBuilder currentInputLineBuilder = currentInputLine.get();
- Symbol res = new Symbol(type, yycolumn, yyline, new LexedValue<T>(value, () -> currentInputLineBuilder.toString(), columns));
+ Symbol res = new Symbol(type, yycolumn, yyline, LexedValue.create(value, () -> currentInputLineBuilder.toString(), columns));
  yyline += lines;
  yycolumn += columns;
  return res;