PERFORCE change 231256 for review

[Jonathan Anderson]

http://p4web.freebsd.org/@@231256?ac=10

Change 231256 by jonathan at jonathan-on-joe on 2013/07/18 16:02:36

	Rename TESLA_NOW to TESLA_ASSERTION_SITE.
	
	Pull in commit b0d631b from GitHub, which renames the 'now' event in a number of places.
	
	This isn't a very complicated change, but it does touch a lot of code.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 (text+ko) ====

@@ -81,7 +81,7 @@
 #define	flags(...)		__tesla_flags(__VA_ARGS__)
 #define	bitmask(...)		__tesla_mask(__VA_ARGS__)
 
-#define	TESLA_NOW __tesla_now
+#define	TESLA_ASSERTION_SITE	__tesla_assertion_site
 
 
 #define	TESLA_STRUCT_AUTOMATON(...)	__tesla_struct_usage(__VA_ARGS__)
@@ -97,10 +97,10 @@
 #define	ANY(int_type)		__tesla_any(int_type)
 
 /** A more programmer-friendly way to write assertions about the past. */
-#define previously(...)    TSEQUENCE(__VA_ARGS__, TESLA_NOW)
+#define previously(...)    TSEQUENCE(__VA_ARGS__, TESLA_ASSERTION_SITE)
 
 /** A more programmer-friendly way to write assertions about the future. */
-#define eventually(...)    TSEQUENCE(TESLA_NOW, __VA_ARGS__)
+#define eventually(...)    TSEQUENCE(TESLA_ASSERTION_SITE, __VA_ARGS__)
 
 /** @} */
 

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 (text+ko) ====

@@ -128,7 +128,7 @@
 struct __tesla_event* __tesla_ignore;
 
 /** Reaching the inline assertion. */
-struct __tesla_event* __tesla_now;
+struct __tesla_event* __tesla_assertion_site;
 
 struct __tesla_event* __tesla_optional(__tesla_event*, ...);