Changeset 105752 in vbox

Timestamp:

Aug 21, 2024 10:14:13 AM (6 months ago)

Author:

vboxsync

Message:

Runtime/script: Add a simple lexer API to turn a stream of characters into tokens for a defined configuration, bugref:10394 [build fix]

Location:

trunk

Files:

• include/iprt/script.h (modified) (7 diffs)
• src/VBox/Runtime/common/script/scriptlex.cpp (modified) (4 diffs)

trunk/include/iprt/script.h

@@ -28 +28 @@
 #define ___iprt_script_h
 
+#include <iprt/cdefs.h>
 #include <iprt/types.h>
 #include <iprt/strcache.h>
@@ -227 +228 @@
  * @param   pvUser        Opaque user data.
  */
-typedef DECLCALLBACK(int) FNRTSCRIPTLEXPROD(RTSCRIPTLEX hScriptLex, char ch, PRTSCRIPTLEXTOKEN pToken, void *pvUser);
+typedef DECLCALLBACKTYPE(int, FNRTSCRIPTLEXPROD,(RTSCRIPTLEX hScriptLex, char ch, PRTSCRIPTLEXTOKEN pToken, void *pvUser));
 /** Pointer to a production rule callback. */
 typedef FNRTSCRIPTLEXPROD *PFNRTSCRIPTLEXPROD;
@@ -318 +319 @@
  * @param   pvUser          Opaque user data passed when creating the lexer.
  */
-typedef DECLCALLBACK(int) FNRTSCRIPTLEXRDR(RTSCRIPTLEX hScriptLex, size_t offBuf, char *pchBuf, size_t cchBuf,
-                                           size_t *pcchRead, void *pvUser);
+typedef DECLCALLBACKTYPE(int, FNRTSCRIPTLEXRDR, (RTSCRIPTLEX hScriptLex, size_t offBuf, char *pchBuf, size_t cchBuf,
+                                                 size_t *pcchRead, void *pvUser));
 /** Pointer to a lexer reader callback. */
 typedef FNRTSCRIPTLEXRDR *PFNRTSCRIPTLEXRDR;
@@ -331 +332 @@
  * @param   pvUser          Opaque user data passed when creating the lexer.
  */
-typedef DECLCALLBACK(void) FNRTSCRIPTLEXDTOR(RTSCRIPTLEX hScriptLex, void *pvUser);
+typedef DECLCALLBACKTYPE(void, FNRTSCRIPTLEXDTOR,(RTSCRIPTLEX hScriptLex, void *pvUser));
 /** Pointer to a lexer destructor callback. */
 typedef FNRTSCRIPTLEXDTOR *PFNRTSCRIPTLEXDTOR;
@@ -556 +557 @@
  *       flag for the first character.
  */
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanIdentifier(RTSCRIPTLEX hScriptLex, char ch,
-                                                    PRTSCRIPTLEXTOKEN pTok, void *pvUser);
+RTDECL(int) RTScriptLexScanIdentifier(RTSCRIPTLEX hScriptLex, char ch, PRTSCRIPTLEXTOKEN pTok, void *pvUser);
 
 
@@ -573 +573 @@
  *       cache on success.
  */
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanStringLiteralC(RTSCRIPTLEX hScriptLex, char ch,
-                                                        PRTSCRIPTLEXTOKEN pTok, void *pvUser);
+RTDECL(int) RTScriptLexScanStringLiteralC(RTSCRIPTLEX hScriptLex, char ch, PRTSCRIPTLEXTOKEN pTok, void *pvUser);
 
 
@@ -591 +590 @@
  *       cache on success.
  */
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanStringLiteralPascal(RTSCRIPTLEX hScriptLex, char ch,
-                                                             PRTSCRIPTLEXTOKEN pTok, void *pvUser);
+RTDECL(int) RTScriptLexScanStringLiteralPascal(RTSCRIPTLEX hScriptLex, char ch, PRTSCRIPTLEXTOKEN pTok, void *pvUser);
 
 /** @} */

trunk/src/VBox/Runtime/common/script/scriptlex.cpp

@@ -921 +921 @@
         {
             if (pTok->Type.Number.enmType == RTSCRIPTLEXTOKNUMTYPE_INTEGER)
-                pTok->Type.Number.Type.i64 = -u64;
+                pTok->Type.Number.Type.i64 = -(int64_t)u64;
             else
                 pTok->Type.Number.Type.u64 = u64;
@@ -939 +939 @@
         ch = RTScriptLexConsumeCh(hScriptLex);
     }
-
-    return VINF_SUCCESS;
-}
-
-
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanIdentifier(RTSCRIPTLEX hScriptLex, char ch,
-                                                    PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
+}
+
+
+RTDECL(int) RTScriptLexScanIdentifier(RTSCRIPTLEX hScriptLex, char ch,
+                                      PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
 {
     PRTSCRIPTLEXINT pThis = hScriptLex;
@@ -1015 +1013 @@
 
 
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanStringLiteralC(RTSCRIPTLEX hScriptLex, char ch,
-                                                        PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
+RTDECL(int) RTScriptLexScanStringLiteralC(RTSCRIPTLEX hScriptLex, char ch,
+                                          PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
 {
     RT_NOREF(ch, pvUser);
@@ -1113 +1111 @@
 
 
-RTDECL(DECLCALLBACK(int)) RTScriptLexScanStringLiteralPascal(RTSCRIPTLEX hScriptLex, char ch,
-                                                             PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
+RTDECL(int) RTScriptLexScanStringLiteralPascal(RTSCRIPTLEX hScriptLex, char ch,
+                                               PRTSCRIPTLEXTOKEN pTok, void *pvUser) RT_NO_THROW_DEF
 {
     RT_NOREF(ch, pvUser);