CPP builtins

* __DATE__
* __TIME__

diff --git a/TODO b/TODO
index 8823a08d0d62df376a392081fdd00a8fcd64de71..c60442f1ac28c186fe634f35145a22e3ff1033a8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -21,3 +21,4 @@
 * real integral type of enums
 
 * #pragma PSI lib "foo" instead of lib "foo";
+* #line directive

diff --git a/src/builtin.c b/src/builtin.c
index 5d9d7e42f00dd9574fd9548bd8b65a696cfaa889..9ed930c042eb4ca19b07165346cf5072c0c10f50 100644 (file)
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -45,9 +45,11 @@ static bool has_feature(struct psi_cpp *cpp, struct psi_token *target, struct ps
 static bool builtin_constant_p(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool BASE_FILE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool COUNTER__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
+static bool DATE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool FILE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool INCLUDE_LEVEL__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool LINE__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
+static bool TIME__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 static bool TIMESTAMP__(struct psi_cpp *cpp, struct psi_token *target, struct psi_plist **args, struct psi_plist **res);
 
 static inline struct psi_plist *builtin_sig(token_t typ, ...)
@@ -109,9 +111,11 @@ PHP_MINIT_FUNCTION(psi_builtin)
 
        PSI_BUILTIN(BASE_FILE__, -1);
        PSI_BUILTIN(COUNTER__, -1);
+       PSI_BUILTIN(DATE__, -1);
        PSI_BUILTIN(FILE__, -1);
        PSI_BUILTIN(INCLUDE_LEVEL__, -1);
        PSI_BUILTIN(LINE__, -1);
+       PSI_BUILTIN(TIME__, -1);
        PSI_BUILTIN(TIMESTAMP__, -1);
 
        return SUCCESS;
@@ -214,7 +218,7 @@ static bool builtin_constant_p(struct psi_cpp *cpp, struct psi_token *target,
 #define ADD_UNSIGNED_NUMBER(u) do { \
        char buf[0x20]; \
        unsigned u_ = u; \
-       size_t len = sprintf(buf, "%u", u_); \
+       size_t len = snprintf(buf, sizeof(buf), "%u", u_); \
        struct psi_token *tok_ = NEW_TOKEN(PSI_T_NUMBER, buf, len); \
        tok_->flags |= PSI_NUMBER_INT | PSI_NUMBER_U; \
        ADD_TOKEN(tok_); \
@@ -234,6 +238,24 @@ static bool COUNTER__(struct psi_cpp *cpp, struct psi_token *target,
        return true;
 }
 
+static bool DATE__(struct psi_cpp *cpp, struct psi_token *target,
+               struct psi_plist **args, struct psi_plist **res)
+{
+       char buf[12];
+       struct tm *tp;
+       time_t t = time(NULL);
+#if HAVE_LOCALTIME_R
+       struct tm tm = {0};
+       tp = localtime_r(&t, &tm);
+#else
+       tp = localtime(&t);
+#endif
+
+       strftime(buf, sizeof(buf), "%b %e %Y", tp);
+       ADD_QUOTED_STRING(buf, 11);
+       return true;
+}
+
 static bool FILE__(struct psi_cpp *cpp, struct psi_token *target,
                struct psi_plist **args, struct psi_plist **res)
 {
@@ -255,6 +277,24 @@ static bool LINE__(struct psi_cpp *cpp, struct psi_token *target,
        return true;
 }
 
+static bool TIME__(struct psi_cpp *cpp, struct psi_token *target,
+               struct psi_plist **args, struct psi_plist **res)
+{
+       char buf[9];
+       struct tm *tp;
+       time_t t = time(NULL);
+#if HAVE_LOCALTIME_R
+       struct tm tm = {0};
+       tp = localtime_r(&t, &tm);
+#else
+       tp = localtime(&t);
+#endif
+
+       strftime(buf, sizeof(buf), "%H:%M:%S", tp);
+       ADD_QUOTED_STRING(buf, 8);
+       return true;
+}
+
 static bool TIMESTAMP__(struct psi_cpp *cpp, struct psi_token *target,
                struct psi_plist **args, struct psi_plist **res)
 {

diff --git a/tests/parser/cpp004.phpt b/tests/parser/cpp004.phpt
index 69d448f08dda1f04a939642ac5c1cd3636b689df..da46c2db7c547b498521c41d1fb4c378c7518b13 100644 (file)
--- a/tests/parser/cpp004.phpt
+++ b/tests/parser/cpp004.phpt
@@ -12,7 +12,7 @@ LC_TIME=C
 ===TEST===
 <?php 
 var_dump(CPP_TEST0, CPP_TEST1, CPP_TEST2, CPP_TEST3, CPP_TEST4, CPP_TEST5);
-var_dump(base_file, include_level, timestamp, file, line);
+var_dump(base_file, include_level, timestamp, file, line, date, time);
 ?>
 ===DONE===
 --EXPECTF--
@@ -28,4 +28,6 @@ int(2)
 string(24) "%s %s %w%d %d:%d:%d %d"
 string(54) "/%s/tests/parser/cpp004/include_level.h"
 int(3)
+string(11) "%s %d %d"
+string(8) "%d:%d:%d"
 ===DONE===

diff --git a/tests/parser/cpp004/builtins.psi b/tests/parser/cpp004/builtins.psi
index 24f79d4f37a18673bea06a737d5518424f673293..50558469c7b10a7046366b2502120defea7634cd 100644 (file)
--- a/tests/parser/cpp004/builtins.psi
+++ b/tests/parser/cpp004/builtins.psi
@@ -11,3 +11,6 @@ const \CPP_TEST5 = c(500);
 
 #include "base_file.h" // includes include_level.h
 #include "timestamp.h"
+
+const \date = __DATE__;
+const \time = __TIME__;