Mercurial > octave

comparison build-aux/mk-opts.pl @ 30046:b3717fd85e49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "m_" prefix for member variables ODE/DAE classes in liboctave/numeric. * build-aux/mk-opts.pl: Rename member variable to "m_reset" used by all *-opts.in files. * DAEFunc.h, DASPK-opts.in, DASPK.cc, DASPK.h, DASRT-opts.in, DASRT.cc, DASRT.h, DASSL-opts.in, DASSL.cc, DASSL.h, LSODE-opts.in, LSODE.cc, LSODE.h: use "m_" prefix for member variables ODE/DAE classes.
author Rik <rik@octave.org>
date Wed, 25 Aug 2021 15:38:23 -0700
parents d8ae55260760
children 796f54d4ddbf
comparison
equal deleted inserted replaced
30045:849bd0f1129c 30046:b3717fd85e49
334 for (my $i = 0; $i < $OPT_NUM; $i++) 334 for (my $i = 0; $i < $OPT_NUM; $i++)
335 { 335 {
336 print "${pfx}$OPTVAR[$i] = ${var}.$OPTVAR[$i];\n"; 336 print "${pfx}$OPTVAR[$i] = ${var}.$OPTVAR[$i];\n";
337 } 337 }
338 338
339 print "${pfx}reset = ${var}.reset;\n"; 339 print "${pfx}m_reset = ${var}.m_reset;\n";
340 } 340 }
341 341
342 ## To silence GCC warnings, we create an initialization list even 342 ## To silence GCC warnings, we create an initialization list even
343 ## though the init function actually does the work of initialization. 343 ## though the init function actually does the work of initialization.
344 344
351 for (my $i = 1; $i < $OPT_NUM; $i++) 351 for (my $i = 1; $i < $OPT_NUM; $i++)
352 { 352 {
353 print "${prefix}$OPTVAR[$i] (),\n"; 353 print "${prefix}$OPTVAR[$i] (),\n";
354 } 354 }
355 355
356 print "${prefix}reset ()\n"; 356 print "${prefix}m_reset ()\n";
357 } 357 }
358 358
359 sub emit_copy_ctor_init_list 359 sub emit_copy_ctor_init_list
360 { 360 {
361 my ($prefix, $var) = @_; 361 my ($prefix, $var) = @_;
365 for (my $i = 1; $i < $OPT_NUM; $i++) 365 for (my $i = 1; $i < $OPT_NUM; $i++)
366 { 366 {
367 print "${prefix}$OPTVAR[$i] ($var.$OPTVAR[$i]),\n"; 367 print "${prefix}$OPTVAR[$i] ($var.$OPTVAR[$i]),\n";
368 } 368 }
369 369
370 print "${prefix}reset ($var.reset)\n"; 370 print "${prefix}m_reset ($var.m_reset)\n";
371 } 371 }
372 372
373 sub emit_opt_class_header 373 sub emit_opt_class_header
374 { 374 {
375 my ($i, $s); 375 my ($i, $s);
439 $s =~ s/\n\s*/\n /g; 439 $s =~ s/\n\s*/\n /g;
440 print $s,"\n"; 440 print $s,"\n";
441 } 441 }
442 } 442 }
443 443
444 print " reset = true;\n", 444 print " m_reset = true;\n",
445 " }\n"; 445 " }\n";
446 446
447 ## For backward compatibility and because set_options is probably 447 ## For backward compatibility and because set_options is probably
448 ## a better name in some contexts: 448 ## a better name in some contexts:
449 449
458 { 458 {
459 if ($SET_EXPR[$i]) 459 if ($SET_EXPR[$i])
460 { 460 {
461 emit_set_decl ($i); 461 emit_set_decl ($i);
462 462
463 print "\n { $OPTVAR[$i] = $SET_EXPR[$i]; reset = true; }\n"; 463 print "\n { $OPTVAR[$i] = $SET_EXPR[$i]; m_reset = true; }\n";
464 } 464 }
465 elsif ($SET_BODY[$i]) 465 elsif ($SET_BODY[$i])
466 { 466 {
467 emit_set_decl ($i); 467 emit_set_decl ($i);
468 468
469 $s = substopt ($SET_BODY[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]); 469 $s = substopt ($SET_BODY[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]);
470 chomp ($s); 470 chomp ($s);
471 $s = ' ' . $s; 471 $s = ' ' . $s;
472 $s =~ s/\n/\n /g; 472 $s =~ s/\n/\n /g;
473 print "\n {\n$s\n reset = true;\n }\n"; 473 print "\n {\n$s\n m_reset = true;\n }\n";
474 } 474 }
475 elsif ($SET_CODE[$i]) 475 elsif ($SET_CODE[$i])
476 { 476 {
477 $s = substopt ($SET_CODE[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]); 477 $s = substopt ($SET_CODE[$i], $OPTVAR[$i], $OPT[$i], $TYPE[$i]);
478 chomp ($s); 478 chomp ($s);
492 for ($i = 0; $i < $OPT_NUM; $i++) 492 for ($i = 0; $i < $OPT_NUM; $i++)
493 { 493 {
494 print " $TYPE[$i] $OPTVAR[$i];\n"; 494 print " $TYPE[$i] $OPTVAR[$i];\n";
495 } 495 }
496 496
497 print "\nprotected:\n\n bool reset;\n};\n\n#endif\n"; 497 print "\nprotected:\n\n bool m_reset;\n};\n\n#endif\n";
498 } 498 }
499 499
500 sub emit_set_decl 500 sub emit_set_decl
501 { 501 {
502 my ($i) = @_; 502 my ($i) = @_;