**/
/* }}} */
-#include <dlfcn.h>
-
#include "cycript.hpp"
-#include "Pooling.hpp"
-
-#include <sys/mman.h>
-
#include <iostream>
#include <set>
#include <map>
#include <sstream>
#include <cmath>
-#include "Error.hpp"
-#include "Execute.hpp"
-#include "Parser.hpp"
-#include "String.hpp"
+#include <dlfcn.h>
-#include "Cycript.tab.hh"
-#include "Driver.hpp"
+#include <sys/mman.h>
#include "ConvertUTF.h"
+#include "Driver.hpp"
+#include "Error.hpp"
+#include "Execute.hpp"
+#include "Pooling.hpp"
+#include "String.hpp"
+#include "Syntax.hpp"
template <>
::pthread_key_t CYLocal<CYPool>::key_ = Key_();
str << (single ? '\'' : '"');
for (const char *value(data), *end(data + size); value != end; ++value)
- switch (*value) {
+ switch (uint8_t next = *value) {
case '\\': str << "\\\\"; break;
case '\b': str << "\\b"; break;
case '\f': str << "\\f"; break;
else goto simple;
break;
+ case '\0':
+ if (value[1] >= '0' && value[1] <= '9')
+ str << "\\x00";
+ else
+ str << "\\0";
+ break;
+
default:
- // this test is designed to be "awesome", generating neither warnings nor incorrect results
- if (*value < 0x20 || *value >= 0x7f)
- str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(uint8_t(*value));
- else simple:
+ if (next >= 0x20 && next < 0x7f) simple:
str << *value;
+ else {
+ unsigned levels(1);
+ if ((next & 0x80) != 0)
+ while ((next & 0x80 >> ++levels) != 0);
+
+ unsigned point(next & 0xff >> levels);
+ while (--levels != 0)
+ point = point << 6 | uint8_t(*++value) & 0x3f;
+
+ if (point < 0x100)
+ str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << point;
+ else if (point < 0x10000)
+ str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << point;
+ else {
+ point -= 0x10000;
+ str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xd800 | point >> 0x0a);
+ str << "\\u" << std::setbase(16) << std::setw(4) << std::setfill('0') << (0xdc00 | point & 0x3ff);
+ }
+ }
}
str << (single ? '\'' : '"');
CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
CYLocalPool local;
- CYDriver driver(stream);
-
- cy::parser parser(driver);
- _assert(parser.parse() == 0);
+ CYDriver driver(local, stream);
+ _assert(!driver.Parse());
_assert(driver.errors_.empty());
CYOptions options;
CYContext context(options);
- driver.program_->Replace(context);
+ driver.script_->Replace(context);
std::stringbuf str;
CYOutput out(str, options);
- out << *driver.program_;
+ out << *driver.script_;
return $pool.strdup(str.str().c_str());
}
return pool;
}
-void CYThrow(const char *format, ...) {
+_visible void CYThrow(const char *format, ...) {
va_list args;
va_start(args, format);
throw CYPoolError(format, args);