Permalink
Browse files

Merge branch 'master' of github.com:manopapad/proper

  • Loading branch information...
2 parents c4a7774 + b36c594 commit 9d120e32c8209ea888b252be41481a9dd7d1d7f3 @eiriniar eiriniar committed Jun 7, 2011
Showing with 145 additions and 232 deletions.
  1. +1 −1 Makefile
  2. +1 −1 README
  3. +1 −1 clean_doc.sh
  4. +1 −1 clean_temp.sh
  5. +2 −4 doc/overview.edoc
  6. +2 −4 examples/b64.erl
  7. +23 −0 examples/elevator_fsm.erl
  8. +2 −4 examples/ets_statem.erl
  9. +2 −4 examples/mm.erl
  10. +2 −5 examples/pdict_statem.erl
  11. +2 −4 examples/stack.erl
  12. +3 −4 include/proper.hrl
  13. +3 −4 include/proper_common.hrl
  14. +3 −4 include/proper_internal.hrl
  15. +3 −4 include/proper_param_adts.hrl
  16. +1 −1 make_doc
  17. +1 −1 rebar.config
  18. +2 −4 src/proper.app.src
  19. +2 −4 src/proper.erl
  20. +2 −4 src/proper_arith.erl
  21. +2 −4 src/proper_array.erl
  22. +2 −4 src/proper_dict.erl
  23. +2 −4 src/proper_fsm.erl
  24. +2 −4 src/proper_gb_sets.erl
  25. +2 −4 src/proper_gb_trees.erl
  26. +2 −4 src/proper_gen.erl
  27. +2 −4 src/proper_orddict.erl
  28. +2 −4 src/proper_ordsets.erl
  29. +2 −4 src/proper_prop_remover.erl
  30. +2 −4 src/proper_queue.erl
  31. +2 −4 src/proper_sets.erl
  32. +2 −4 src/proper_shrink.erl
  33. +2 −4 src/proper_statem.erl
  34. +2 −4 src/proper_symb.erl
  35. +2 −4 src/proper_transformer.erl
  36. +2 −4 src/proper_types.erl
  37. +2 −4 src/proper_typeserver.erl
  38. +2 −4 src/strip_types.erl
  39. +2 −4 src/vararg.erl
  40. +2 −4 test/auto_export_test1.erl
  41. +2 −4 test/auto_export_test2.erl
  42. +2 −4 test/command_props.erl
  43. +2 −4 test/error_statem.erl
  44. +2 −4 test/ets_counter.erl
  45. +2 −4 test/ets_statem.erl
  46. +2 −4 test/no_native_parse_test.erl
  47. +2 −4 test/no_out_of_forall_test.erl
  48. +2 −4 test/nogen_statem.erl
  49. +2 −4 test/numbers_fsm.erl
  50. +2 −4 test/pdict_fsm.erl
  51. +2 −5 test/pdict_statem.erl
  52. +2 −4 test/post_false.erl
  53. +2 −4 test/prec_false.erl
  54. +2 −4 test/proper_tests.erl
  55. +2 −4 test/rec_props_test1.erl
  56. +2 −4 test/rec_props_test2.erl
  57. +2 −4 test/rec_test1.erl
  58. +2 −4 test/rec_test2.erl
  59. +2 −4 test/symb_statem.erl
  60. +2 −4 test/to_remove.erl
  61. +2 −4 test/types_test1.erl
  62. +2 −4 test/types_test2.erl
  63. +2 −4 test/weird_types.erl
View
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-# Author: Manolis Papadakis <manopapad@gmail.com>
+# Author: Manolis Papadakis
# Description: Instructions for make
.PHONY: default all compile dialyze check_scripts tests doc clean distclean rebuild retest
View
@@ -582,7 +582,7 @@ maximum instance of 'size' S-1. The actual size of an instance is measured
differently for each type: the actual size of a list is its length, while the
actual size of a tree may be the number of its internal nodes. Some types, e.g.
unions, have no notion of size, thus their generation is not influenced by the
-value of 'size'. The 'size' parameter starts at 0 and grows automatically during
+value of 'size'. The 'size' parameter starts at 1 and grows automatically during
testing.
?SIZED(<S>, <Generator>)
View
@@ -19,7 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-# Author: Manolis Papadakis <manopapad@gmail.com>
+# Author: Manolis Papadakis
# Description: Cleanup script for EDoc-generated documentation files
rm -f doc/*.html doc/stylesheet.css doc/erlang.png doc/edoc-info
View
@@ -19,7 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-# Author: Manolis Papadakis <manopapad@gmail.com>
+# Author: Manolis Papadakis
# Description: Cleanup script for temporary files
DIRS=.\ `ls -l | grep '^d' | awk '{print $8}'`
View
@@ -20,11 +20,9 @@ along with PropEr. If not, see <http://www.gnu.org/licenses/>.
This is the source for PropEr's overview page.
-@copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
- Eirini Arvaniti <eirinibob@gmail.com>
- and Kostis Sagonas <kostis@cs.ntua.gr>
+@copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
@version {@version}
-@author Manolis Papadakis <manopapad@gmail.com>
+@author Manolis Papadakis
@title PropEr: A QuickCheck-inspired property-based testing tool for Erlang
@doc No top-level documentation yet.
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @author Kostis Sagonas
%%% @doc PropEr usage example: Some simple testcases for stdlib's base64
-module(b64).
@@ -1,3 +1,26 @@
+%%% Copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
+%%% Eirini Arvaniti <eirinibob@gmail.com>
+%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%%
+%%% This file is part of PropEr.
+%%%
+%%% PropEr is free software: you can redistribute it and/or modify
+%%% it under the terms of the GNU General Public License as published by
+%%% the Free Software Foundation, either version 3 of the License, or
+%%% (at your option) any later version.
+%%%
+%%% PropEr is distributed in the hope that it will be useful,
+%%% but WITHOUT ANY WARRANTY; without even the implied warranty of
+%%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+%%% GNU General Public License for more details.
+%%%
+%%% You should have received a copy of the GNU General Public License
+%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
+
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @version {@version}
+%%% @author Eirini Arvaniti
+
-module(elevator_fsm).
-behaviour(gen_fsm).
-behaviour(proper_fsm).
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Eirini Arvaniti <eirinibob@gmail.com>
+%%% @author Eirini Arvaniti
%%% @doc Simple statem test for ets tables
-module(ets_statem).
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc PropEr usage example: Static mastermind solver
-module(mm).
@@ -17,12 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Kresten Krab Thorup <krab@trifork.com>,
-%%% edited by Eirini Arvaniti <eirinibob@gmail.com>
+%%% @author Kresten Krab Thorup, edited by Eirini Arvaniti
%%% @doc Simple statem test for the process dictionary
-module(pdict_statem).
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Auto-ADT usage example: list-based implementation of a stack, with
%%% element counting
View
@@ -17,10 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @version {@version}
+%%% @author Manolis Papadakis
%%% @doc User header file: This file should be included in each file containing
%%% user type declarations and/or properties to be tested.
@@ -17,10 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @version {@version}
+%%% @author Manolis Papadakis
%%% @doc Common parts of user and internal header files
@@ -17,10 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @version {@version}
+%%% @author Manolis Papadakis
%%% @doc Internal header file: This header is included in all PropEr source
%%% files.
@@ -17,10 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @version {@version}
+%%% @author Manolis Papadakis
%%% @doc Complementary user header file: This file can be included in any
%%% module, to allow for the use of parametric versions of some common
%%% opaque datatypes from STDLIB. PropEr will recognize these types as
View
@@ -18,7 +18,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% Author: Manolis Papadakis <manopapad@gmail.com>
+%%% Author: Manolis Papadakis
%%% Description: Documentation processing script: This script will call EDoc on
%%% the application's source files, after inlining all types
%%% denoted as aliases, and removing from the exported types lists
View
@@ -17,7 +17,7 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% Author: Manolis Papadakis <manopapad@gmail.com>
+%%% Author: Manolis Papadakis
%%% Description: Options for rebar
%% WARNING: Our version of rebar doesn't automatically report warnings,
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc This is the source for the proper.app file.
{application, proper,
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc This is the main PropEr module.
%%%
%%% == How to write properties (test case generators) ==
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc This module contains helper arithmetic, list handling and random
%%% functions.
%%% @private
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to array module.
%%% @private
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to dict module.
%%% @private
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Eirini Arvaniti <eirinibob@gmail.com>
+%%% @author Eirini Arvaniti
%%% @doc This module defines the `proper_fsm' behaviour, useful for testing
%%% systems that can be modeled as finite state machines. That is, a finite
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to gb_sets module.
%%% @private
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to gb_trees module.
%%% @private
View
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc The generator subsystem and generators for basic types are contained
%%% in this module.
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to orddict module.
%%% @private
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc Parametric wrapper to ordsets module.
%%% @private
@@ -17,11 +17,9 @@
%%% You should have received a copy of the GNU General Public License
%%% along with PropEr. If not, see <http://www.gnu.org/licenses/>.
-%%% @copyright 2010-2011 Manolis Papadakis <manopapad@gmail.com>,
-%%% Eirini Arvaniti <eirinibob@gmail.com>
-%%% and Kostis Sagonas <kostis@cs.ntua.gr>
+%%% @copyright 2010-2011 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
%%% @version {@version}
-%%% @author Manolis Papadakis <manopapad@gmail.com>
+%%% @author Manolis Papadakis
%%% @doc This module contains PropEr's helper parse transformer. It is
%%% automatically applied to modules when compiled internally by the
%%% typeserver. It essentially removes all functions that contain ?FORALLs,
Oops, something went wrong.

0 comments on commit 9d120e3

Please sign in to comment.