Change more uses of 'numFields()' in tests

Signed-off-by: David Longnecker <[email protected]>
chapel-lang · Jul 26, 2023 · 33cf424 · 33cf424
1 parent cade0f1
commit 33cf424
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/modules/standard/CommDiagnostics.chpl b/modules/standard/CommDiagnostics.chpl
@@ -474,7 +474,7 @@ module CommDiagnostics
     var CommDiags = getCommDiagnostics();
 
     // cache number of fields and store vector of whether field is active
-    param nFields = numFields(chpl_commDiagnostics);
+    param nFields = getNumFields(chpl_commDiagnostics);
 
     // How wide should the column be for this field?  A negative value
     // indicates an unstable field.  0 indicates that the field should

diff --git a/test/library/packages/csv/CSV.chpl b/test/library/packages/csv/CSV.chpl
@@ -72,7 +72,7 @@ module CSV {
         if line.size == 0 then
           continue;
         const vals = line.split(sep);
-        for param i in 0..numFields(t)-1 {
+        for param i in 0..getNumFields(t)-1 {
           getFieldRef(r, i) = vals[i]: getField(r, i).type;
         }
         if skipHeader {
@@ -158,9 +158,9 @@ module CSV {
       use Reflection;
       if !writing then compilerError("writing to a reading channel");
 
-      for param i in 0..<numFields(t) {
+      for param i in 0..<getNumFields(t) {
         ch.write(getField(r, i));
-        if i != numFields(t)-1 then
+        if i != getNumFields(t)-1 then
           ch.write(sep);
       }
       ch.writeln();

diff --git a/test/llvm/alignment/check-align-padding.chpl b/test/llvm/alignment/check-align-padding.chpl
@@ -52,7 +52,7 @@ extern proc getOffset(const ref base, const ref field): int(64);
 
 proc printFieldOffsets(ref base: ?t) {
   use Reflection;
-  for param i in 0..numFields(t)-1 {
+  for param i in 0..getNumFields(t)-1 {
     writeln(getFieldName(base.type, i), ": ", getField(base, i).type:string, " = ", getOffset(base, getField(base, i)));
   }
 }

diff --git a/test/param/bharshbarg/refToGetFieldType.chpl b/test/param/bharshbarg/refToGetFieldType.chpl
@@ -14,7 +14,7 @@ const x = new R(int, real, 42);
 const ref q = x.A;
 writeln("q = ", q);
 
-for param i in 0..<numFields(x.type) {
+for param i in 0..<getNumFields(x.type) {
   param name = getFieldName(x.type, i);
   const ref val = getField(x, i);
 

diff --git a/test/param/ferguson/fielderator-user-class.chpl b/test/param/ferguson/fielderator-user-class.chpl
@@ -6,7 +6,7 @@ class R {
 }
 
 
-assert(numFields(R) == 2);
+assert(getNumFields(R) == 2);
 assert(getFieldName(R, 0) == "x");
 
 assert(getFieldIndex(R, "x") == 0);

diff --git a/test/param/ferguson/fielderator-user.chpl b/test/param/ferguson/fielderator-user.chpl
@@ -6,7 +6,7 @@ record R {
 }
 
 
-assert(numFields(R) == 2);
+assert(getNumFields(R) == 2);
 assert(getFieldName(R, 0) == "x");
 
 assert(getFieldIndex(R, "x") == 0);

diff --git a/test/types/partial/isFieldBound.chpl b/test/types/partial/isFieldBound.chpl
@@ -11,7 +11,7 @@ record R {
 proc main() {
   type T = R(int, U=real, ?);
 
-  for param i in 0..<numFields(T) {
+  for param i in 0..<getNumFields(T) {
     param name = getFieldName(T, i);
     writeln("T.", name, ": ", isFieldBound(T, name));
   }