Ported back to cygwin.

diff --git a/Console.cpp b/Console.cpp
index 50692f27c42c043445c1ee3635a2d349d4c87d86..c6809479319d05620de0c848ec7b0bf48ce5b331 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -573,7 +573,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     bool compile(false);
     CYOptions options;
 
     bool compile(false);
     CYOptions options;
 

-    append_history$ = reinterpret_cast<int (*)(int, const char *)>(dlsym(RTLD_DEFAULT, "append_history"));
+    append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));

 
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));
 
 #ifdef CY_ATTACH
     pid_t pid(_not(pid_t));

diff --git a/Cycript.l.in b/Cycript.l.in
index c6ff5abaa538f44c763b9107bb239b2252e2ee94..f97158e294a183e55fb143596b60e9e80cca23e1 100644 (file)
--- a/Cycript.l.in
+++ b/Cycript.l.in
@@ -40,13 +40,7 @@ typedef cy::parser::token tk;
 #define C T yyextra->state_ = CYClear;
 #define R T yyextra->state_ = CYRestricted;
 
 #define C T yyextra->state_ = CYClear;
 #define R T yyextra->state_ = CYRestricted;
 

-#define E(prefix) L C { \
-    char *value(A char[yyleng + sizeof(prefix)]); \
-    memcpy(value, prefix, sizeof(prefix) - 1); \
-    memcpy(value + sizeof(prefix) - 1, yytext, yyleng); \
-    value[yyleng + sizeof(prefix) - 1] = '\0'; \
-    I(literal, RegEx(value), RegularExpressionLiteral); \
-}
+#define E L C I(literal, RegEx(Y), RegularExpressionLiteral);

 
 #define N \
     if (yyextra->state_ != CYNewLine) { \
 
 #define N \
     if (yyextra->state_ != CYNewLine) { \


@@ -147,7 +141,7 @@ XMLName {XMLNameStart}{XMLNamePart}*
 
 %%
 
 
 %%
 

-<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} E("")
+<RegExp>\/{RegularExpressionBody}\/{RegularExpressionFlags} E

 
 \/\/[^\n]* L
 
 
 \/\/[^\n]* L
 

diff --git a/Parser.hpp b/Parser.hpp
index aad1d478db2ec111ddf7ab8121897a40a8eb519a..b126d5a5fee8e4578a3d84300fb6189597d5b419 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -303,6 +303,7 @@ struct CYScope {
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);
     CYIdentifierValueSet identifiers_;
 
     CYScope(CYScopeType type, CYContext &context, CYStatement *&statements);

+    virtual ~CYScope();

 
     void Close();
 
 
     void Close();
 

diff --git a/Replace.cpp b/Replace.cpp
index 5803478d1d6ffc16418e3c703eae99c3f0a6c527..e6b761f6bdd17b34e8d3744f13bc9953f7c6ec0f 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -621,6 +621,9 @@ CYScope::CYScope(CYScopeType type, CYContext &context, CYStatement *&statements)
     context_.scope_ = this;
 }
 
     context_.scope_ = this;
 }
 

+CYScope::~CYScope() {
+}
+

 void CYScope::Close() {
     context_.scope_ = parent_;
     Scope(context_, statements_);
 void CYScope::Close() {
     context_.scope_ = parent_;
     Scope(context_, statements_);