X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..413251da5de4da59f158f65a75d668a67f4161f1:/Replace.hpp

diff --git a/Replace.hpp b/Replace.hpp
index 96115c2..c41ae28 100644
--- a/Replace.hpp
+++ b/Replace.hpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
@@ -19,8 +19,8 @@
 **/
 /* }}} */
 
-#ifndef REPLACE_HPP
-#define REPLACE_HPP
+#ifndef CYCRIPT_REPLACE_HPP
+#define CYCRIPT_REPLACE_HPP
 
 #include "Parser.hpp"
 
@@ -52,17 +52,17 @@
     CYStatements()
 
 #define $P1(arg0, args...) \
-    $P($I(arg0), ##args)
+    $P(arg0, ##args)
 #define $P2(arg0, arg1, args...) \
-    $P($I(arg0), $P1(arg1, ##args))
+    $P(arg0, $P1(arg1, ##args))
 #define $P3(arg0, arg1, arg2, args...) \
-    $P($I(arg0), $P2(arg1, arg2, ##args))
+    $P(arg0, $P2(arg1, arg2, ##args))
 #define $P4(arg0, arg1, arg2, arg3, args...) \
-    $P($I(arg0), $P3(arg1, arg2, arg3, ##args))
+    $P(arg0, $P3(arg1, arg2, arg3, ##args))
 #define $P5(arg0, arg1, arg2, arg3, arg4, args...) \
-    $P($I(arg0), $P4(arg1, arg2, arg3, arg4, ##args))
+    $P(arg0, $P4(arg1, arg2, arg3, arg4, ##args))
 #define $P6(arg0, arg1, arg2, arg3, arg4, arg5, args...) \
-    $P($I(arg0), $P5(arg1, arg2, arg3, arg4, arg5, ##args))
+    $P(arg0, $P5(arg1, arg2, arg3, arg4, arg5, ##args))
 
 #define $C(args...) \
     ($ CYCall(args))
@@ -110,8 +110,8 @@
 #define $N5(func, args...) \
     $N(func, $C5_(args))
 
-#define $L(args...) \
-    $ CYDeclaration(args)
+#define $L(arg0, args...) \
+    $ CYDeclaration($I(arg0), ##args)
 #define $L1(arg0) \
     $ CYDeclarations(arg0)
 #define $L2(arg0, args...) \
@@ -123,4 +123,4 @@
 #define $L5(arg0, args...) \
     $ CYDeclarations(arg0, $L4(args))
 
-#endif/*REPLACE_HPP*/
+#endif/*CYCRIPT_REPLACE_HPP*/