--- a/lib/accessor.h	Fri Nov 18 17:21:16 2011 +0100
+++ b/lib/accessor.h	Fri Nov 18 17:28:37 2011 +0100
@@ -6,15 +6,14 @@
 // variable declaration macros
 #define __DECLARE_VAR(type, name)\
 	__IEC_##type##_t name;
-#define __DECLARE_GLOBAL(type, resource, name)\
-	__IEC_##type##_t resource##__##name;\
-	static __IEC_##type##_t *GLOBAL__##name = &resource##__##name;\
+#define __DECLARE_GLOBAL(type, domain, name)\
+	__IEC_##type##_t domain##__##name;\
+	static __IEC_##type##_t *GLOBAL__##name = &(domain##__##name);\
 	void __INIT_GLOBAL_##name(type value) {\
 		(*GLOBAL__##name).value = value;\
 	}\
-	void __SET_GLOBAL_##name(type value) {\
-		if (!((*GLOBAL__##name).flags & __IEC_FORCE_FLAG))\
-			(*GLOBAL__##name).value = value;\
+	IEC_BYTE __IS_GLOBAL_##name##_FORCED(void) {\
+		return (*GLOBAL__##name).flags & __IEC_FORCE_FLAG;\
 	}\
 	type* __GET_GLOBAL_##name(void) {\
 		return &((*GLOBAL__##name).value);\
@@ -23,13 +22,12 @@
 	extern type *location;
 #define __DECLARE_GLOBAL_LOCATED(type, resource, name)\
 	__IEC_##type##_p resource##__##name;\
-	static __IEC_##type##_p *GLOBAL__##name = &resource##__##name;\
+	static __IEC_##type##_p *GLOBAL__##name = &(resource##__##name);\
 	void __INIT_GLOBAL_##name(type value) {\
 		*((*GLOBAL__##name).value) = value;\
 	}\
-	void __SET_GLOBAL_##name(type value) {\
-		if (!((*GLOBAL__##name).flags & __IEC_FORCE_FLAG))\
-			*((*GLOBAL__##name).value) = value;\
+	IEC_BYTE __IS_GLOBAL_##name##_FORCED(void) {\
+		return (*GLOBAL__##name).flags & __IEC_FORCE_FLAG;\
 	}\
 	type* __GET_GLOBAL_##name(void) {\
 		return (*GLOBAL__##name).value;\
@@ -52,16 +50,21 @@
 	    __INIT_GLOBAL_##name(temp);\
 	    __INIT_RETAIN((*GLOBAL__##name), retained)\
     }
-#define __INIT_GLOBAL_LOCATED(resource, name, location, retained)\
-	resource##__##name.value = location;\
-	__INIT_RETAIN(resource##__##name, retained)
+#define __INIT_GLOBAL_LOCATED(domain, name, location, retained)\
+	domain##__##name.value = location;\
+	__INIT_RETAIN(domain##__##name, retained)
 #define __INIT_EXTERNAL(type, global, name, retained)\
-	name.value = __GET_GLOBAL_##global();\
-    __INIT_RETAIN(name, retained)
+    {\
+		extern type* __GET_GLOBAL_##global();\
+		name.value = __GET_GLOBAL_##global();\
+		__INIT_RETAIN(name, retained)\
+    }
 #define __INIT_LOCATED(type, location, name, retained)\
-	{extern type *location;\
-	 name.value = location;\
-	 __INIT_RETAIN(name, retained)}
+	{\
+		extern type *location;\
+		name.value = location;\
+		__INIT_RETAIN(name, retained)\
+    }
 #define __INIT_LOCATED_VALUE(name, initial)\
 	*(name.value) = initial;
 
@@ -81,14 +84,12 @@
 	((name.flags & __IEC_FORCE_FLAG) ? &(name.fvalue __VA_ARGS__) : &(*(name.value) __VA_ARGS__))
 
 // variable setting macros
-#define __SET_VAR(name, new_value, ...)\
-	if (!(name.flags & __IEC_FORCE_FLAG)) name.value __VA_ARGS__ = new_value
-#define __SET_EXTERNAL(global, name, new_value)\
-	if (!(name.flags & __IEC_FORCE_FLAG))\
-		__SET_GLOBAL_##global(new_value)
-#define __SET_COMPLEX_EXTERNAL(name, new_value, ...)\
-	*(name.value) __VA_ARGS__ = new_value
-#define __SET_LOCATED(name, new_value, ...)\
-	if (!(name.flags & __IEC_FORCE_FLAG)) *(name.value) __VA_ARGS__ = new_value
+#define __SET_VAR(prefix, name, new_value, ...)\
+	if (!(prefix name.flags & __IEC_FORCE_FLAG)) prefix name.value __VA_ARGS__ = new_value
+#define __SET_EXTERNAL(prefix, name, new_value, ...)\
+	if (!(prefix name.flags & __IEC_FORCE_FLAG || __IS_GLOBAL_##name##_FORCED()))\
+		(*(prefix name.value)) __VA_ARGS__ = new_value
+#define __SET_LOCATED(prefix, name, new_value, ...)\
+	if (!(prefix name.flags & __IEC_FORCE_FLAG)) *(prefix name.value) __VA_ARGS__ = new_value
 
 #endif //__ACCESSOR_H