|
From: <js...@us...> - 2006-11-23 17:23:36
|
Revision: 17
http://svn.sourceforge.net/jcontracts/?rev=17&view=rev
Author: jstuyts
Date: 2006-11-23 09:23:27 -0800 (Thu, 23 Nov 2006)
Log Message:
-----------
Corrected names of system properties.
Modified Paths:
--------------
trunk/source/java/net/sf/jcontracts/icontract/Class.java
trunk/source/java/net/sf/jcontracts/icontract/Method.java
trunk/source/java/net/sf/jcontracts/icontract/Tool.java
Modified: trunk/source/java/net/sf/jcontracts/icontract/Class.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Class.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -618,9 +618,9 @@
String inst_var_decl = "// Keeps track of calling chain to avoid recursive invariant checks.\n";
inst_var_decl = inst_var_decl + "// Avoids inv checks in public methods that are called from private ones.\n";
inst_var_decl = inst_var_decl + "// Stores bookkeeping information -- key: thread, value: call level\n";
- boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("icontract.internal.do_not_enforce_precompilation_of_source");
+ boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source");
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:icontract.internal.do_not_enforce_precompilation_of_source=true");
+ System.err.println("iContract:SWITCH:jcontracts.internal.do_not_enforce_precompilation_of_source=true");
}
boolean icl_already_defined = false;
if (!do_not_enforce_precompilation_of_source) {
@@ -632,7 +632,7 @@
}
}
if (do_not_enforce_precompilation_of_source) {
- System.err.println("iContract:SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Dicontract.internal.do_not_enforce_precompilation_of_source' property to make net.sf.jcontracts.net.sf.jcontracts.iContract work in normal (correct) mode!");
+ System.err.println("iContract:SWITCH:invariant bookkeeping may NOT work correctly because the check for the existence of the __icl_ variable in superclasses was disables. This means that there is an __icl_ varaible at each level of the inheritance rather than one and one only per inheritance chain! THIS IS ONLY SUITABLE FOR CERTAIN SPECIAL TESTCASES. REMOVE the 'java -Djcontracts.internal.do_not_enforce_precompilation_of_source' property to make net.sf.jcontracts.net.sf.jcontracts.iContract work in normal (correct) mode!");
}
if (!icl_already_defined) {
inst_var_decl = inst_var_decl + "protected transient java.util.Hashtable __icl_ = new java.util.Hashtable(1);\n";
Modified: trunk/source/java/net/sf/jcontracts/icontract/Method.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Method.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -855,10 +855,10 @@
log.debug("getOldVarSaveCode:type_of_val=" + type_of_val);
String tmp_val = getMangledValue(val);
log.debug("getOldVarSaveCode:tmp_val =" + tmp_val);
- boolean do_clone_for_oldvalues = Boolean.getBoolean("icontract.internal.do_clone_for_oldvalues");
+ boolean do_clone_for_oldvalues = Boolean.getBoolean("jcontracts.internal.do_clone_for_oldvalues");
if (do_clone_for_oldvalues) {
- System.err.println("iContract:SWITCH:icontract.internal.do_clone_for_oldvalues=true");
- System.err.println("Classes that implement java.lang.Cloneable, Arrays and Strings will be cloned if they appear in postcondition old-value references (e.g. @post xxx@pre). THIS IS NOT DEFAULT BEHAVIOUR PAST 0.2b6, remove -Dicontract.internal.do_clone_for_oldvalues to disable.");
+ System.err.println("iContract:SWITCH:jcontracts.internal.do_clone_for_oldvalues=true");
+ System.err.println("Classes that implement java.lang.Cloneable, Arrays and Strings will be cloned if they appear in postcondition old-value references (e.g. @post xxx@pre). THIS IS NOT DEFAULT BEHAVIOUR PAST 0.2b6, remove -Djcontracts.internal.do_clone_for_oldvalues to disable.");
if (type_of_val.equals("int") || type_of_val.equals("float") || type_of_val.equals("boolean") || type_of_val.equals("byte") || type_of_val.equals("double") || type_of_val.equals("long") || type_of_val.equals("short") || type_of_val.equals("char")) {
code = code + "// can not call methods on " + type_of_val + " (therefore no clone).\n";
code = code + type_of_val + " " + tmp_val + " = " + base_val + "; // save " + val + " (in " + (String)post_source.elementAt(i) + ")\n";
Modified: trunk/source/java/net/sf/jcontracts/icontract/Tool.java
===================================================================
--- trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-23 17:21:27 UTC (rev 16)
+++ trunk/source/java/net/sf/jcontracts/icontract/Tool.java 2006-11-23 17:23:27 UTC (rev 17)
@@ -118,7 +118,7 @@
if (!unresolved.isEmpty()) {
log.error("\n");
log.error("could not resolve the following type names:\n" + unresolved);
- boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("icontract.internal.do_not_enforce_precompilation_of_source");
+ boolean do_not_enforce_precompilation_of_source = Boolean.getBoolean("jcontracts.internal.do_not_enforce_precompilation_of_source");
if (!do_not_enforce_precompilation_of_source) {
throw new RuntimeException("could not resolve the following type names:\n" + unresolved);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|