rename somewhat

nix-community · Aug 2, 2024 · f204a12 · f204a12
1 parent 568e16e
commit f204a12
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/libnixf/include/nixf/Sema/VariableLookup.h b/libnixf/include/nixf/Sema/VariableLookup.h
@@ -36,14 +36,16 @@ class Definition {
     /// \brief From ambda arg e.g.  a: a + 1
     DS_LambdaArg,
 
-    /// \brief From lambda formal, e.g. { a }: a + 1
-    DS_LambdaFormal,
+    /// \brief From lambda (noarg) formal, e.g. { a }: a + 1
+    DS_LambdaNoArg_Formal,
 
-    /// \brief From lambda arg with formal, e.g. `a` in `{ foo }@a: foo + 1`
-    DS_LambdaArgWithFormal,
+    /// \brief From lambda (with `@arg`) `arg`,
+    /// e.g. `a` in `{ foo }@a: foo + 1`
+    DS_LambdaWithArg_Arg,
 
-    /// \brief From lambda formal with arg, e.g. `foo` in `{ foo }@a: foo + 1`
-    DS_LambdaFormalWithArg,
+    /// \brief From lambda (with `@arg`) formal,
+    /// e.g. `foo` in `{ foo }@a: foo + 1`
+    DS_LambdaWithArg_Formal,
 
     /// \brief From recursive attribute set.  e.g. rec { }
     DS_Rec,

diff --git a/libnixf/src/Basic/diagnostic.py b/libnixf/src/Basic/diagnostic.py
@@ -190,20 +190,20 @@ class Diagnostic(TypedDict):
         "message": "definition `{}` in let-expression is not used",
     },
     {
-        "sname": "sema-unused-def-formal",
-        "cname": "UnusedDefFormal",
+        "sname": "sema-unused-def-lambda-noarg-formal",
+        "cname": "UnusedDefLambdaNoArg_Formal",
         "severity": "Warning",
         "message": "attribute `{}` of argument is not used",
     },
     {
-        "sname": "sema-unused-def-arg-with-formal",
-        "cname": "UnusedDefArgWithFormal",
+        "sname": "sema-unused-def-lambda-witharg-formal",
+        "cname": "UnusedDefLambdaWithArg_Formal",
         "severity": "Warning",
         "message": "argument `{}` in `@`-pattern is not used",
     },
     {
-        "sname": "sema-unused-def-formal-with-arg",
-        "cname": "UnusedDefFormalWithArg",
+        "sname": "sema-unused-def-lambda-witharg-arg",
+        "cname": "UnusedDefLambdaWithArg_Arg",
         "severity": "Hint",
         "message": "attribute `{}` of `@`-pattern argument is not used, but may be referenced from the argument",
     },

diff --git a/libnixf/src/Sema/VariableLookup.cpp b/libnixf/src/Sema/VariableLookup.cpp
@@ -56,12 +56,12 @@ void VariableLookupAnalysis::emitEnvLivenessWarning(
         switch (Def->source()) {
         case Definition::DS_Let:
           return Diagnostic::DK_UnusedDefLet;
-        case Definition::DS_LambdaFormal:
-          return Diagnostic::DK_UnusedDefFormal;
-        case Definition::DS_LambdaFormalWithArg:
-          return Diagnostic::DK_UnusedDefFormalWithArg;
-        case Definition::DS_LambdaArgWithFormal:
-          return Diagnostic::DK_UnusedDefArgWithFormal;
+        case Definition::DS_LambdaNoArg_Formal:
+          return Diagnostic::DK_UnusedDefLambdaNoArg_Formal;
+        case Definition::DS_LambdaWithArg_Formal:
+          return Diagnostic::DK_UnusedDefLambdaWithArg_Formal;
+        case Definition::DS_LambdaWithArg_Arg:
+          return Diagnostic::DK_UnusedDefLambdaWithArg_Arg;
         default:
           assert(false && "liveness diagnostic encountered an unknown source!");
           __builtin_unreachable();
@@ -151,7 +151,7 @@ void VariableLookupAnalysis::dfs(const ExprLambda &Lambda,
     } else if (!Arg.formals()->dedup().contains(Arg.id()->name())) {
       ToDef.insert_or_assign(Arg.id(),
                              DBuilder.add(Arg.id()->name(), Arg.id(),
-                                          Definition::DS_LambdaArgWithFormal));
+                                          Definition::DS_LambdaWithArg_Arg));
     }
   }
 
@@ -169,8 +169,8 @@ void VariableLookupAnalysis::dfs(const ExprLambda &Lambda,
   if (Arg.formals()) {
     for (const auto &[Name, Formal] : Arg.formals()->dedup()) {
       Definition::DefinitionSource Source =
-          Arg.id() ? Definition::DS_LambdaFormalWithArg
-                   : Definition::DS_LambdaFormal;
+          Arg.id() ? Definition::DS_LambdaWithArg_Formal
+                   : Definition::DS_LambdaNoArg_Formal;
       ToDef.insert_or_assign(Formal->id(),
                              DBuilder.add(Name, Formal->id(), Source));
     }

diff --git a/libnixf/test/Sema/VariableLookup.cpp b/libnixf/test/Sema/VariableLookup.cpp
@@ -142,7 +142,7 @@ TEST_F(VLATest, LivenessFormal) {
 
   ASSERT_EQ(Diags.size(), 1);
 
-  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefFormal);
+  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefLambdaNoArg_Formal);
   ASSERT_EQ(Diags[0].tags().size(), 1);
 }
 
@@ -177,7 +177,7 @@ TEST_F(VLATest, LivenessArgWithFormal) {
 
   ASSERT_EQ(Diags.size(), 1);
 
-  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefArgWithFormal);
+  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefLambdaWithArg_Arg);
   ASSERT_EQ(Diags[0].range().lCur().column(), 8);
   ASSERT_EQ(Diags[0].tags().size(), 1);
 }
@@ -189,7 +189,7 @@ TEST_F(VLATest, LivenessFormalWithArg) {
 
   ASSERT_EQ(Diags.size(), 1);
 
-  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefFormalWithArg);
+  ASSERT_EQ(Diags[0].kind(), Diagnostic::DK_UnusedDefLambdaWithArg_Formal);
   ASSERT_EQ(Diags[0].range().lCur().column(), 2);
   ASSERT_EQ(Diags[0].tags().size(), 1);
   ASSERT_EQ(Diags[0].tags()[0], DiagnosticTag::Faded);

diff --git a/nixd/tools/nixd/test/diagnostic/liveness-formal.md b/nixd/tools/nixd/test/diagnostic/liveness-formal.md
@@ -38,7 +38,7 @@
 ```
      CHECK: "diagnostics": [
 CHECK-NEXT:   {
-CHECK-NEXT:     "code": "sema-unused-def-formal",
+CHECK-NEXT:     "code": "sema-unused-def-lambda-noarg-formal",
 CHECK-NEXT:     "message": "attribute `y` of argument is not used",
 CHECK-NEXT:     "range": {
 CHECK-NEXT:       "end": {