diff --git a/refdoc/chapters/preprocessor.xml b/refdoc/chapters/preprocessor.xml
index eda5dc75643ddd66d226a711f2d6e716e2484411..9583e869a7b1381769a0f5f44b40b80ad4e7dd7c 100644
--- a/refdoc/chapters/preprocessor.xml
+++ b/refdoc/chapters/preprocessor.xml
@@ -152,183 +152,83 @@ the text before it.</li>
<section title="Preprocessor Directives">
-<p>All the preprocessor directives should be at the beginning of the
-line. Although indentation is allowed currently, it is possible that
-it will generate warnings or errors in the future. It is however
-allowed to put spaces after the hash character to create indentation
-in code.</p>
-
-<subsection title="#!">
-<p>All lines beginning with <tt>#!</tt> will be regarded as comments,
-to enable shell integration. It is recommended that Pike applications
-begin with the line <tt>"#! /usr/bin/env pike"</tt> for maximum cross
-platform compatibility.</p>
-</subsection>
-
-<subsection title="#<integer> and #line">
-<p>A hash character followed by a number or by the string
-<tt>"line"</tt> and a number will make the preprocessor line counter
-set this number as the line number for the next line and adjust the
-following lines accordingly. All error messages from Pike will use
-these line numbers. Optionally the number may be followed by a file
-name, e.g. <tt>#1 "/home/pike/program.pike.in"</tt>. Then this
-filename will be used instead of the current file for error
-messages.</p>
-</subsection>
-
-<subsection title='#""'>
-<p>If a string literal is opened with <tt>#"</tt> newlines in the
-string will end up in the string literal, instead of triggering a
-<tt>"newline in string"</tt> error. Newlines will be converted to
-<tt>\n</tt> characters if the newlines in the file is something else.
-This preprocessor directive may appear anywhere a string may
-appear.</p>
-</subsection>
-
-<subsection title="#string">
-<p>The preprocessor directive #string will load the file in the
-string that follows and insert its contents as a string. This
-preprocessor directive may appear anywhere a string may appear.</p>
-<example>
-do_something(#string "the_file.wks");
-</example>
-</subsection>
-
-<subsection title="#include">
-<p><tt>#include</tt> may be used to insert the contents of another
-file into the processed file at the place of the include directive.
-Files can be referenced either by absolute or relative path from the
-source file by using double quotes, or searched for in the include
-paths. To include a file with absolute or relative path, use double
-quotes, e.g. <tt>#include "constants.pike"</tt> or <tt>#include
-"../debug.h"</tt>. To include from the include paths, use less than
-and greater than, e.g. <tt>#include <profiling.h></tt>. It is
-also possible to include a file whose path is defined in a
-preprocessor define, e.g. <tt>#include USER_SETTINGS</tt>.</p>
-</subsection>
-
-<subsection title="#if">
-<p>The <tt>#if</tt> directive can evaluate simple expressions and, if
-the expression is evaluated to true, "activate" the code block that
-follows. The code block ends when an <tt>#endif</tt>, <tt>#else</tt>,
-<tt>#elseif</tt> or <tt>#elif</tt> block is encountered on the same
-nesting depth.</p>
-
-<p>The <tt>#if</tt> expressions may include defines, integer, string
-and float constants, ?:, || and && operations, ~, ^, !, | and
-& operations, <, >, <=, >=, == and != operations, +,
--, *, /, << and >> operations and paranthesis. Strings may
-also be indexed with the [] index operator. Finally there are three
-special "functions" available in <tt>#if</tt> expressions; defined,
-efun and constant. Define returns true if the symbol given as argument
-is defined. <tt>#if defined(MY_DEF)</tt> is equal to <tt>#ifdef
-MY_DEF</tt>. Efun returns true if its argument is an efun and constant
-returns true if its argument can be resolved into a constant.</p>
-</subsection>
-
-<subsection title="#ifdef">
-<p><tt>#ifdef</tt> works as <tt>#if</tt>, but instead of evaluating
-its arguments it just checks if the first symbol is a defined define
-or marcro.</p>
-</subsection>
-
-<subsection title="#ifndef">
-<p>Works as an inverted <tt>#ifndef</tt>; it only "activates" the
-following block if the symbol is not defined.</p>
-</subsection>
-
-<subsection title="#endif">
-<p>Ends a block opened by <tt>#if</tt>, <tt>#ifdef</tt>, <tt>#ifndef</tt>,
-<tt>#else</tt>, <tt>#elseif</tt> or <tt>#elif</tt>.</p>
-<example>
-#if DEBUG
-do_debug_stuff();
-#endif /* DEBUG */
-</example>
-</subsection>
+<p>All of the preprocessor directives except the string-related
+(<tt>#string</tt> and <tt>#""</tt>) should have the hash character
+(<tt>#</tt>) as the first character of the line. Even though it is currently
+allowed to be indented, it is likely that this will generate warnings or errors
+in the future. Note that it is however allowed to put white-space between the
+hash character and the rest of the directive to create indentation in code.</p>
-<subsection title="#else">
-<p>This directive is used to divide the current code block into another
-code block with inverse activation.</p>
-<example>
-#ifdef FAST_ALGORITHM
-do_fast_algorithm();
-#elif defined(EXPERIMENTAL_ALGORITHM)
-do_experimental_algorithm();
-#else
-do_default_algorithm();
-#endif
-</example>
-</subsection>
+<insert-move entity="cpp::.#!"/>
-<subsection title="#elseif and #elif">
-<p><tt>#elseif</tt> and <tt>#elif</tt> works as <tt>elseif</tt> in the
-<tt>#if</tt>/<tt>#ifdef</tt>/<tt>#ifndef</tt> context.</p>
-</subsection>
+<insert-move entity="cpp::.#line"/>
-<subsection title="#undefine and #undef">
-<p><tt>#undefine</tt> and <tt>#undefine</tt> undefines the symbol
-given as argument.</p>
-<example>
-// Strip debug
-#define werror(X ...) lambda(X){}
-#include "/home/someone/experimental/stuff.h"
-#undef werror
-</example>
-</subsection>
+<insert-move entity='cpp::.#""'/>
-<subsection title="#error">
-<p>Throws an error during preprocessing.</p>
-<example>
-#ifdef __NT__
-#error "This program can not run on MS Windows."
-#endif
-</example>
-</subsection>
+<insert-move entity="cpp::.#string"/>
-<subsection title="#charset">
-<p>Tells the preprocessor which charset the file is encoded with. The
-Locale.Charset module is called with this string to decode the
-file.</p>
-</subsection>
+<insert-move entity="cpp::.#include"/>
-<subsection title="#pike">
-<p>Tells the compiler which version of Pike it should emulate.</p>
-<example>
-#pike 7.2
-</example>
-</subsection>
+<insert-move entity="cpp::.#if"/>
-<subsection title="#pragma all_inline">
-</subsection>
+<insert-move entity="cpp::.#ifdef"/>
-<subsection title="#pragma all_final">
-<p>Instructs the compiler to mark all symbols as final.</p>
-</subsection>
+<insert-move entity="cpp::.#ifndef"/>
-<subsection title="#pragma all_nomask">
-<p>Deprecated version of #pragma all_final</p>
-</subsection>
+<insert-move entity="cpp::.#endif"/>
-<subsection title="#pragma strict_types">
-</subsection>
+<insert-move entity="cpp::.#else"/>
-<subsection title="#pragma save_parent and #pragma dont_save_parent">
-</subsection>
+<insert-move entity="cpp::.#elif"/>
-<subsection title="#warning">
-<p>Generates a warning during compilation.</p>
-<example>
-#if !constant(Crypto.SHA1.hash)
-#warning SHA1 hash not available.
-#endif
-</example>
-</subsection>
+<insert-move entity="cpp::.#define"/>
+
+<insert-move entity="cpp::.#undef"/>
+
+<insert-move entity="cpp::.#error"/>
+
+<insert-move entity="cpp::.#charset"/>
+
+<insert-move entity="cpp::.#pike"/>
+
+<insert-move entity="cpp::.#pragma"/>
+
+<insert-move entity="cpp::.#warning"/>
</section>
<section title="Predefined defines">
- <insert-move entity="cpp::"/>
+ <insert-move entity="cpp::.__VERSION__"/>
+ <insert-move entity="cpp::.__MAJOR__"/>
+ <insert-move entity="cpp::.__MINOR__"/>
+ <insert-move entity="cpp::.__BUILD__"/>
+ <insert-move entity="cpp::.__REAL_VERSION__"/>
+ <insert-move entity="cpp::.__REAL_MAJOR__"/>
+ <insert-move entity="cpp::.__REAL_MINOR__"/>
+ <insert-move entity="cpp::.__REAL_BUILD__"/>
+ <insert-move entity="cpp::.__DATE__"/>
+ <insert-move entity="cpp::.__TIME__"/>
+ <insert-move entity="cpp::.__FILE__"/>
+ <insert-move entity="cpp::.__DIR__"/>
+ <insert-move entity="cpp::.__LINE__"/>
+ <insert-move entity="cpp::.__AUTO_BIGNUM__"/>
+ <insert-move entity="cpp::.__NT__"/>
+ <insert-move entity="cpp::.__PIKE__"/>
+ <insert-move entity="cpp::.__amigaos__"/>
+ <insert-move entity="cpp::._Pragma"/>
+ <insert-move entity="cpp::.static_assert"/>
</section>
+<section title="Test functions">
+
+ <p>These functions are used in <ref resolved="cpp::#if">#if</ref> et al
+ expressions to test for presence of symbols.</p>
+
+ <insert-move entity="cpp::.constant"/>
+ <insert-move entity="cpp::.defined"/>
+
+</section>
+
+ <!-- insert-move entity="cpp::"/ -->
+
</chapter>
diff --git a/src/cpp.c b/src/cpp.c
index 48db061567fc34e90505fc7d05767c16b84a73fa..158242956164426c8e3ee8d1d4c86ecf0e19c37f 100644
--- a/src/cpp.c
+++ b/src/cpp.c
@@ -465,6 +465,10 @@ static void cpp_warning(struct cpp *this, const char *cpp_warn_fmt, ...)
/*! @endclass
*/
+/*! @namespace predef:: */
+/*! @decl import cpp:: */
+/*! @endnamespace */
+
/* #pike handling. */
void cpp_change_compat(struct cpp *this, int major, int minor)
@@ -504,6 +508,338 @@ void cpp_change_compat(struct cpp *this, int major, int minor)
/* #if macros and functions. */
+/*! @namespace cpp::
+ *!
+ *! Pike has a builtin C-style preprocessor. It works similar to the
+ *! ANSI-C preprocessor but has a few extra features. These and the
+ *! default set of preprocessor macros are described here.
+ */
+
+/*! @directive #!
+ *!
+ *! All lines beginning with @[#!] will be regarded as comments,
+ *! to enable shell integration. It is recommended that Pike applications
+ *! begin with the line @tt{"#! /usr/bin/env pike"@} for maximum cross
+ *! platform compatibility.
+ */
+
+/*! @directive #charset
+ *!
+ *! Inform the preprocessor about which charset the file is encoded with.
+ *! The Locale.Charset module is called with this string to decode the
+ *! remainder of the file.
+ */
+
+/*! @directive #if
+ *!
+ *! The @[#if] directive can evaluate simple expressions and, if
+ *! the expression is evaluates to true, "activate" the code block that
+ *! follows. The code block ends when an @[#endif], @[#else],
+ *! @[#elseif] or @[#elif] block is encountered at the same
+ *! nesting depth.
+ *!
+ *! The @[#if] expressions may include defines, integer, string
+ *! and float constants, @tt{?:@}, @tt{||@} and @tt{&&@} operations,
+ *! @tt{~@}, @tt{^@}, @tt{!@}, @tt{|@} and @tt{&@} operations,
+ *! @tt{<@}, @tt{>@}, @tt{<=@}, @tt{>=@}, @tt{==@} and @tt{!=@} operations,
+ *! @tt{+@}, @tt{-@}, @tt{*@}, @tt{/@}, @tt{<<@} and @tt{>>@} operations
+ *! and paranthesis.
+ *!
+ *! Strings may also be indexed with the @tt{[]@} index operator.
+ *! Finally there are three special "functions" available in @[#if]
+ *! expressions; @[defined()], @[efun()] and @[constant()].
+ *!
+ *! @seealso
+ *! @[#ifdef], @[#ifndef], @[#elif], @[#else], @[#endif],
+ *! @[defined()], @[constant()], @[efun()]
+ */
+
+/*! @directive #ifdef
+ *!
+ *! Check whether an identifier is a macro.
+ *!
+ *! The directive
+ *!
+ *! @tt{#ifdef @i{<identifier>@}@}
+ *!
+ *! is equvivalent to
+ *!
+ *! @tt{#if @[defined](@i{<identifier>@})@}
+ *!
+ *! @seealso
+ *! @[#if], @[#ifndef], @[defined]
+ */
+
+/*! @directive #ifndef
+ *!
+ *! Check whether an identifier is not a macro.
+ *!
+ *! This is the inverse of @[#ifdef].
+ *!
+ *! The directive
+ *!
+ *! @tt{#ifndef @i{<identifier>@}@}
+ *!
+ *! is equvivalent to
+ *!
+ *! @tt{#if !@[defined](@i{<identifier>@})@}
+ *!
+ *! @seealso
+ *! @[#if], @[#ifdef], @[defined]
+ */
+
+/*! @directive #endif
+ *!
+ *! End a block opened with @[#if], @[#ifdef], @[#ifndef],
+ *! @[#else], @[#elseif] or @[#elif].
+ *!
+ *! @example
+ *! @code
+ *! #ifdef DEBUG
+ *! do_debug_stuff();
+ *! #endif // DEBUG
+ *! @endcode
+ */
+
+/*! @directive #else
+ *!
+ *! This directive is used to divide the current code block into another
+ *! code block with inverse activation.
+ *!
+ *! @example
+ *! @code
+ *! #ifdef FAST_ALGORITHM
+ *! do_fast_algorithm();
+ *! #elif defined(EXPERIMENTAL_ALGORITHM)
+ *! do_experimental_algorithm();
+ *! #else
+ *! do_default_algorithm();
+ *! #endif
+ *! @endcode
+ */
+
+/*! @directive #elif
+ *! @directive #elseif
+ *!
+ *! These work as a combined @[#else] and @[#if] without
+ *! adding an extra level of nesting.
+ *!
+ *! @example
+ *!
+ *! The following two are equvivalent:
+ *!
+ *! @code
+ *! #ifdef A
+ *! // Code for A.
+ *! #else
+ *! #ifdef B
+ *! // Code for B.
+ *! #else
+ *! #ifdef C
+ *! // Code for C.
+ *! #else
+ *! // Code for D.
+ *! #endif
+ *! #endif
+ *! #endif
+ *! @endcode
+ *!
+ *! And
+ *!
+ *! @code
+ *! #ifdef A
+ *! // Code for A.
+ *! #elif defined(B)
+ *! // Code for B.
+ *! #elseif defined(C)
+ *! // Code for C.
+ *! #else
+ *! // Code for D.
+ *! #endif
+ *! @endcode
+ *!
+ *! @seealso
+ *! @[#if], @[#ifdef], @[#else], @[defined()], @[constant()]
+ */
+
+/*! @directive #error
+ *!
+ *! Throw an error during preprocessing.
+ *!
+ *! This directive causes a cpp error. It can be used to notify
+ *! the user that certain functions are missing and similar things.
+ *!
+ *! @note
+ *! Note that this directive will cause @[cpp()] to throw
+ *! an error at the end of preprocessing, which will cause
+ *! any compilation to fail.
+ *!
+ *! @example
+ *! @code
+ *! #if !constant(Yp)
+ *! #error Support for NIS not available.
+ *! #endif
+ *! @endcode
+ *!
+ *! @seealso
+ *! @[#warning]
+ */
+
+/*! @directive #warning
+ *!
+ *! Generate a warning during preprocessing.
+ *!
+ *! This directive causes a cpp warning, it can be used to notify
+ *! the user that certain functions are missing and similar things.
+ *!
+ *! @example
+ *! @code
+ *! #if !constant(Yp)
+ *! #warning Support for NIS not available. Some features may not work.
+ *! #endif
+ *! @endcode
+ *!
+ *! @seealso
+ *! @[#error]
+ */
+
+/*! @directive #include
+ *!
+ *! @[#include] is used to insert the contents of another file into
+ *! the processed file at the place of the include directive.
+ *!
+ *! Files can be referenced either by absolute or relative path from the
+ *! source file, or searched for in the include paths.
+ *!
+ *! To include a file with absolute or relative path, use double quotes,
+ *! e.g. @tt{#include "constants.pike"@} or @tt{#include "../debug.h"@}.
+ *!
+ *! To include from the include paths, use less than and greater than,
+ *! e.g. @tt{#include <profiling.h>@}.
+ *!
+ *! It is also possible to include a file whose path is defined in a
+ *! preprocessor macro, e.g. @tt{#include USER_SETTINGS@}.
+ */
+
+/*! @directive #line
+ *! @directive #<integer>
+ *!
+ *! A hash character followed by a number or by the string
+ *! @tt{"line"@} and a number will make the preprocessor line counter
+ *! set this number as the line number for the next line and adjust the
+ *! following lines accordingly.
+ *!
+ *! All error messages from Pike will use these line numbers.
+ *!
+ *! Optionally the number may be followed by a file name, e.g.
+ *! @tt{#line 1 "/home/pike/program.pike.in"@}. Then this
+ *! filename will be used instead of the current file for error
+ *! messages.
+*/
+
+/*! @directive #pike
+ *!
+ *! Set the Pike compiler backward compatibility level.
+ *!
+ *! This tells the compiler which version of Pike it should
+ *! attempt to emulate from this point on in the current
+ *! compilation unit.
+ *!
+ *! This is typically used to "quick-fix" old code to work
+ *! with more recent versions of Pike.
+ *!
+ *! @example
+ *! @code
+ *! // This code was written for Pike 7.2, and depends on
+ *! // the old behaviour for @[7.2::dirname()].
+ *! #pike 7.2
+ *!
+ *! // ... Code that uses @[dirname()] ...
+ *! @endcode
+ *!
+ *! This directive is also needed for Pike modules that
+ *! have been installed globally, and might be used by
+ *! a Pike that has been started with the @tt{-V@} flag.
+ *!
+ *! @example
+ *! @code
+ *! // Pike modules that are bundled with Pike are
+ *! // typically written for the same version of Pike.
+ *! #pike __REAL_VERSION__
+ *! @endcode
+ */
+
+/*! @directive #""
+ *! If a string literal is opened with @tt{#"@} newlines in the
+ *! string will end up in the string literal, instead of triggering a
+ *! @tt{"newline in string"@} error.
+ *!
+ *! @note
+ *! Newlines will be converted to @tt{\n@} characters in the string
+ *! even if the newlines in the file are something else.
+ *!
+ *! This preprocessor directive may appear anywhere a string may
+ *! appear.
+ *!
+ *! @seealso
+ *! @[#string]
+ */
+
+/*! @directive #string
+ *! The preprocessor directive @[#string] will load the file in the
+ *! string that follows and insert its contents as a string. This
+ *! preprocessor directive may appear anywhere a string may appear.
+ *!
+ *! @example
+ *! @code
+ *! do_something(#string "the_file.wks");
+ *! @endcode
+ *!
+ *! @seealso
+ *! @[#include]
+ */
+
+/*! @directive #pragma
+ *!
+ *! This is a generic directive for flags to the compiler.
+ *!
+ *! These are some of the flags that are available:
+ *! @string
+ *! @value "all_inline"
+ *! This is the same as adding the modifier @tt{inline@}
+ *! to all functions that follow.
+ *! @value "all_final"
+ *! Instructs the compiler to mark all symbols as @tt{final@}.
+ *! @value "all_nomask"
+ *! Deprecated version of @tt{"all_final"@}.
+ *! @value "save_parent"
+ *! Cause nested classes to save a reference to their
+ *! surrounding class even if not strictly needed.
+ *! @value "dont_save_parent"
+ *! Inverse of @tt{"save_parent"@}. This is needed to override
+ *! if the global symbol @[predef::__pragma_save_parent__]
+ *! has been set.
+ *! @value "strict_types"
+ *! Enable warnings for all cases where the compiler
+ *! isn't certain that the types are correct.
+ *! @endstring
+*/
+
+/*! @decl int(0..1) defined(mixed identifier)
+ *!
+ *! Check whether an identifier is a cpp macro or not.
+ *!
+ *! @returns
+ *! @[defined] returns true if the symbol given as argument
+ *! is defined.
+ *!
+ *! @note
+ *! @tt{#if defined(MY_DEF)@} is equvivalent to
+ *! @tt{#ifdef MY_DEF@}.
+ *!
+ *! @seealso
+ *! @[#if], @[#ifdef], @[constant()]
+ */
static void check_defined(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -674,6 +1010,14 @@ static void cpp_low_constant(struct cpp *this, int value)
push_int(res);
}
+/*! @decl int(0..1) constant(mixed identifier)
+ *! @decl __deprecated__ int(0..1) efun(mixed identifier)
+ *!
+ *! Check whether the argument resolves to a constant or not.
+ *!
+ *! @seealso
+ *! @[#if], @[defined()]
+ */
void cpp_func_constant(struct cpp *this, INT32 args)
{
if (args != 1) {
@@ -733,6 +1077,25 @@ static struct define *alloc_empty_define(struct pike_string *name,
return def;
}
+/*! @directive #undef
+ *! @directive #undefine
+ *!
+ *! This removes the effect of a @[#define], all subsequent occurances of
+ *! the undefined identifier will not be replaced by anything.
+ *!
+ *! @note
+ *! Note that when undefining a macro, you just give the identifer,
+ *! not the arguments.
+ *!
+ *! @example
+ *! // Strip debug
+ *! #define werror(X ...) 0
+ *! #include "/home/someone/experimental/stuff.h"
+ *! #undef werror
+ *!
+ *! @seealso
+ *! @[#define], @[defined()]
+ */
static void undefine(struct cpp *this,
struct pike_string *name)
{
@@ -758,6 +1121,32 @@ static void undefine(struct cpp *this,
free((char *)d);
}
+/*! @directive #define
+ *!
+ *! This directive is used to define or redefine a cpp macro.
+ *!
+ *! The simplest way to use define is to write
+ *!
+ *! @code
+ *! #define @b{@i{<identifier>@}@} @i{<replacement string>@}
+ *! @endcode
+ *!
+ *! which will cause all subsequent occurances of @tt{@b{@i{<identifier@}@}@}
+ *! to be replaced with the @tt{@i{<replacement string>@}@}.
+ *!
+ *! Define also has the capability to use arguments, thus a line like
+ *!
+ *! @code
+ *! #define @b{@i{<identifier>@}@}(arg1, arg2) @i{<replacement string>@}
+ *! @endcode
+ *!
+ *! would cause @tt{@b{@i{<identifer>@}@}@} to be a macro. All occurances of
+ *! '@tt{@b{@i{<identifier>@}@}(something1,something2d)@}' would be replaced
+ *! with the @tt{@i{<replacement string>@}@}.
+ *! And in the @tt{@i{<replacement string>@}@}, @tt{arg1@} and @tt{arg2@}
+ *! will be replaced with @tt{something1@} and @tt{something2@}.
+ */
+
static struct define *do_magic_define(struct cpp *this,
char *name,
magic_define_fun fun)
@@ -1652,6 +2041,12 @@ static ptrdiff_t low_cpp(struct cpp *this, void *data, ptrdiff_t len,
}
/*** Magic defines ***/
+
+/*! @decl constant __LINE__
+ *!
+ *! This define contains the current line number, represented as an
+ *! integer, in the source file.
+ */
static void insert_current_line(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1660,6 +2055,10 @@ static void insert_current_line(struct cpp *this,
string_builder_sprintf(tmp, " %ld ", (long)this->current_line);
}
+/*! @decl constant __FILE__
+ *!
+ *! This define contains the file path and name of the source file.
+ */
static void insert_current_file_as_string(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1669,6 +2068,10 @@ static void insert_current_file_as_string(struct cpp *this,
this->current_file->size_shift, tmp);
}
+/*! @decl constant __DIR__
+ *!
+ *! This define contains the directory path of the source file.
+ */
static void insert_current_dir_as_string(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1682,6 +2085,11 @@ static void insert_current_dir_as_string(struct cpp *this,
pop_stack();
}
+/*! @decl constant __TIME__
+ *!
+ *! This define contains the current time at the time of compilation,
+ *! e.g. "12:20:51".
+ */
static void insert_current_time_as_string(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1696,6 +2104,11 @@ static void insert_current_time_as_string(struct cpp *this,
PUSH_STRING0((p_wchar0 *)buf+11, 8, tmp);
}
+/*! @decl constant __DATE__
+ *!
+ *! This define contains the current date at the time of compilation,
+ *! e.g. "Jul 28 2001".
+ */
static void insert_current_date_as_string(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1711,6 +2124,15 @@ static void insert_current_date_as_string(struct cpp *this,
PUSH_STRING0((p_wchar0 *)buf+19, 5, tmp);
}
+/*! @decl constant __VERSION__
+ *!
+ *! This define contains the current Pike version as a float. If
+ *! another Pike version is emulated, this define is updated
+ *! accordingly.
+ *!
+ *! @seealso
+ *! @[__REAL_VERSION__]
+ */
static void insert_current_version(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1721,6 +2143,14 @@ static void insert_current_version(struct cpp *this,
}
+/*! @decl constant __MINOR__
+ *! This define contains the minor part of the current Pike version,
+ *! represented as an integer. If another Pike version is emulated,
+ *! this define is updated accordingly.
+ *!
+ *! @seealso
+ *! @[__REAL_MINOR__]
+ */
static void insert_current_minor(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1729,7 +2159,15 @@ static void insert_current_minor(struct cpp *this,
string_builder_sprintf(tmp, " %d ", this->compat_minor);
}
-
+/*! @decl constant __MAJOR__
+ *!
+ *! This define contains the major part of the current Pike version,
+ *! represented as an integer. If another Pike version is emulated,
+ *! this define is updated accordingly.
+ *!
+ *! @seealso
+ *! @[__REAL_MAJOR__]
+ */
static void insert_current_major(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1739,6 +2177,17 @@ static void insert_current_major(struct cpp *this,
}
/* _Pragma(STRING) */
+/*! @decl void _Pragma(string directive)
+ *!
+ *! This macro inserts the corresponding @[#pragma] @[directive]
+ *! in the source.
+ *!
+ *! e.g. @expr{_Pragma("strict_types")@} is the same
+ *! as @expr{#pragma strict_types@} .
+ *!
+ *! @seealso
+ *! @[#pragma]
+ */
static void insert_pragma(struct cpp *this,
struct define *def,
struct define_argument *args,
@@ -1830,21 +2279,6 @@ static void insert_callback_define_no_args(struct cpp *this,
if (Pike_sp > save_sp) pop_n_elems(Pike_sp-save_sp);
}
-/*! @namespace predef:: */
-/*! @decl import cpp:: */
-/*! @endnamespace */
-
-/*! @namespace cpp:: */
-
-/*! @decl constant __VERSION__
- *!
- *! This define contains the current Pike version as a float. If
- *! another Pike version is emulated, this define is updated
- *! accordingly.
- *!
- *! @seealso
- *! @[__REAL_VERSION__]
- */
/*! @decl constant __REAL_VERSION__
*!
@@ -1855,15 +2289,6 @@ static void insert_callback_define_no_args(struct cpp *this,
*! @[__VERSION__]
*/
-/*! @decl constant __MAJOR__
- *!
- *! This define contains the major part of the current Pike version,
- *! represented as an integer. If another Pike version is emulated,
- *! this define is updated accordingly.
- *!
- *! @seealso
- *! @[__REAL_MAJOR__]
- */
/*! @decl constant __REAL_MAJOR__
*!
@@ -1874,14 +2299,6 @@ static void insert_callback_define_no_args(struct cpp *this,
*! @[__MAJOR__]
*/
-/*! @decl constant __MINOR__
- *! This define contains the minor part of the current Pike version,
- *! represented as an integer. If another Pike version is emulated,
- *! this define is updated accordingly.
- *!
- *! @seealso
- *! @[__REAL_MINOR__]
- */
/*! @decl constant __REAL_MINOR__
*!
@@ -1910,42 +2327,11 @@ static void insert_callback_define_no_args(struct cpp *this,
*! @[__BUILD__]
*/
-/*! @decl constant __LINE__
- *!
- *! This define contains the current line number, represented as an
- *! integer, in the source file.
- */
-/*! @decl constant __FILE__
- *!
- *! This define contains the file path and name of the source file.
- */
-/*! @decl constant __DIR__
- *!
- *! This define contains the directory path of the source file.
- */
-/*! @decl constant __DATE__
- *!
- *! This define contains the current date at the time of compilation,
- *! e.g. "Jul 28 2001".
- */
-/*! @decl constant __TIME__
- *!
- *! This define contains the current time at the time of compilation,
- *! e.g. "12:20:51".
- */
-/*! @decl void _Pragma(string directive)
- *!
- *! This macro inserts the corresponding @expr{#pragma@} @[directive]
- *! in the source.
- *!
- *! e.g. @expr{_Pragma("strict_types")@} is the same
- *! as @expr{#pragma strict_types@} .
- */
/*! @decl constant static_assert
*!