Allow $n in env exp for file names

bengsig · bengsig · commit 40856496c6c1 · 2023-05-08T15:31:31.000Z
diff --git a/man/man1rwl/filestatement.1rwl b/man/man1rwl/filestatement.1rwl
@@ -87,6 +87,8 @@ of $NAME or ${NAME} is done similar to how it is done in the shell, unless the
 option or the
 .B $namexpand:off
 directive is in effect. 
+You can also use $n where n is a single digit beteen 1 and 9 to expand the value of a positional
+argument to rwloadsim.
 This is not done for pipelines, although the popen call is likely to do it.
 .P
 If the concatenation is 
diff --git a/man/man1rwl/include.1rwl b/man/man1rwl/include.1rwl
@@ -27,6 +27,8 @@ directive.
 Unless -no-nameexpand option or the $nameexpand:off directive is used,
 environment names in either $NAME or ${NAME} syntax will be expanded
 before opening the include file.
+You can also use $n where n is a single digit beteen 1 and 9 to expand the value of a positional
+argument to rwloadsim.
 .P
 If the filename is embedded within the characters < and > instead of ",
 the name cannot start with . or / and
diff --git a/oltp/csvdata.rwl b/oltp/csvdata.rwl
@@ -531,7 +531,7 @@ execute at rwloadsim
   # which events E1 .. E8 are, and to assemble
   # the plotline for gnuplot
   sql ashevents
-    select '# '||to_char(enum+2,'FM9')||': '||ename
+    select '# '||to_char(enum+2,'FM99')||': '||ename
     , ename
     from rwlash
     where runnumber = :1
diff --git a/src/rwlmisc.c b/src/rwlmisc.c
@@ -14,6 +14,7 @@
  *
  * History
  *
+ * bengsig   8-may-2023 - Use $n in e.g. $include
  * bengsig   1-may-2023 - $hostname directive
  * bengsig  24-apr-2023 - Prevent gcc 4.4.7 warning
  * bengsig  17-apr-2023 - Engineering notation output
@@ -2261,6 +2262,31 @@ text *rwlenvexp2(rwl_xeqenv *xev, rwl_location *loc, text *filn, ub4 eeflags, ub
       *n++ = *p++;
       i++;
     }
+    else if (p[1] >= '1' && p[1] <= '9')
+    {
+      // $n where n is a single digit 1..9
+      text dollar[4];
+      sb4 j;
+      dollar[0] = (text) '$';
+      dollar[1] = p[1];
+      dollar[2] = 0;
+      p += 2;
+      if ((j=rwlfindvar(xev, dollar, RWL_VAR_NOGUESS))>0)
+      {
+        // $n exists
+	r = xev->evar[j].num.sval;
+	while (*r && i<RWL_PATH_MAX-1) // copy as long as it fits
+	{
+	  *n++ = *r++;
+	  i++;
+	}
+      }
+      else
+      {
+	failcode = RWL_ERROR_BAD_ENV_EXPANSION;
+	goto exitfromenvexp;
+      }
+    }
     else
     {
       // found an environment variable
diff --git a/test/344-i.rwl b/test/344-i.rwl
@@ -0,0 +1,3 @@
+integer abc;
+
+abc := 42;
diff --git a/test/344.rwl b/test/344.rwl
@@ -0,0 +1,5 @@
+$include:"$1.rwl"
+
+printline abc;
+
+$include:<$2.rwl>
diff --git a/test/test.sh b/test/test.sh
@@ -47,7 +47,7 @@ then
   testlist="$*"
 else
   # note that 323..326 test CQN which we don't currently compile in
-  testlist='1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322                 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343'
+  testlist='1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322                 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344'
 fi
 
 diffokcount=0;
@@ -168,6 +168,10 @@ do
     180)
       pre='--len4 12345 --abc 42'
     ;;
+    344)
+      pre='-A 1'
+      post='344-i'
+    ;;
   esac
 
   diffok=no
diff --git a/test/testres/344.err.good b/test/testres/344.err.good
@@ -0,0 +1,3 @@
+RWL-017: error at [344.rwl;5]: '$2' has not been declared
+RWL-207: error at [344.rwl;5]: illegal environment expansion in file name '$2.rwl'
+RWL-001: error: cannot open '$2.rwl' for reading
diff --git a/test/testres/344.out.good b/test/testres/344.out.good
@@ -0,0 +1 @@
+42

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+RWL-017: error at [344.rwl;5]: '$2' has not been declared`
	`2`	`+RWL-207: error at [344.rwl;5]: illegal environment expansion in file name '$2.rwl'`
	`3`	`+RWL-001: error: cannot open '$2.rwl' for reading`