Skip to content

Use the current spellings of --user-defined-invariant and --var-omit-pattern #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mernst merged 2 commits into from
Oct 11, 2026
Merged

Use the current spellings of --user-defined-invariant and --var-omit-pattern #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b3fcfc
Use the current spellings of --user-defined-invariant and --var-omit-…
mernst Oct 11, 2026
d3fe680
Use --var-omit-pattern in RatPoly Makefile; capture stderr in runclus…
mernst Oct 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/developer.texinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ call the new invariant's @code{get_proto} method and recompile Daikon.
@item
If you do not wish to edit the Daikon source code, then compile the new
invariant and put its @file{.class} file on your classpath. Then, invoke
Daikon with the @option{--user_defined_invariant} command-line argument
Daikon with the @option{--user-defined-invariant} command-line argument
(@pxref{Options to control invariant detection,,,daikon,Daikon User Manual}).
@end itemize

Expand Down
2 changes: 1 addition & 1 deletion java/daikon/Daikon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ public static String getOptarg(Getopt g) {
}

/**
* Invariants passed on the command line with the {@code --user_defined_invariant} option. A list
* Invariants passed on the command line with the {@code --user-defined-invariant} option. A list
* of class names in the format required by {@link Class#forName(String)}.
*/
private static List<@ClassGetName String> userDefinedInvariants =
Expand Down
2 changes: 1 addition & 1 deletion scripts/runcluster.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ ()
}

my $invfile = "runcluster_temp_$algorithm-$ncluster.inv";
$command = "java -cp $SCRIPTDIR/../daikon.jar -Xmx7g daikon.Daikon -o $invfile --config_option daikon.PptTopLevel.pairwise_implications=true --var_omit_pattern=\"class\" --no_text_output --no_show_progress $spinfo_file $decls_new " . join(' ', @new_dtraces) . " 2>&1 > runcluster_temp_Daikon_output.txt";
$command = "java -cp $SCRIPTDIR/../daikon.jar -Xmx7g daikon.Daikon -o $invfile --config_option daikon.PptTopLevel.pairwise_implications=true --var-omit-pattern=\"class\" --no_text_output --no_show_progress $spinfo_file $decls_new " . join(' ', @new_dtraces) . " > runcluster_temp_Daikon_output.txt 2>&1";
system_or_die($command, $verbose);

$invfile =~ /(.*)\.inv/;
Expand Down
2 changes: 1 addition & 1 deletion scripts/trace-purge-vars.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# regular expression. (Its name is taken from grep.)

# This script reduces the size of a trace file, but typically, using
# Daikon's --var_omit_pattern flag is a better option.
# Daikon's --var-omit-pattern flag is a better option.

# I'm intentionally not operating by paragraphs, because I want the regexp
# to only apply to the variable lines.
Expand Down
2 changes: 1 addition & 1 deletion tests/daikon-tests/RatPoly/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ESC_ON:=1

include ../../Makefile.common

# USER_DAIKON_OPTIONS:=--var_omit_pattern=".*wrapped.*"
# USER_DAIKON_OPTIONS:=--var-omit-pattern=".*wrapped.*"

# USER_DAIKON_OPTIONS:=--ppt-select-pattern="^Rat" --config config.txt

Expand Down
Loading