**/
/* }}} */
-#include <dlfcn.h>
-
#include "cycript.hpp"
-#include "Pooling.hpp"
-
-#include <sys/mman.h>
-
#include <iostream>
#include <set>
#include <map>
-#include <iomanip>
#include <sstream>
-#include <cmath>
+#include <dlfcn.h>
+
+#include <sys/mman.h>
+
+#include "Code.hpp"
+#include "ConvertUTF.h"
#include "Driver.hpp"
#include "Error.hpp"
#include "Execute.hpp"
-#include "Parser.hpp"
+#include "Pooling.hpp"
#include "String.hpp"
-
-#include "ConvertUTF.h"
-
-template <>
-::pthread_key_t CYLocal<CYPool>::key_ = Key_();
+#include "Syntax.hpp"
/* C Strings {{{ */
CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16) {
// XXX: this is wrong
size_t size(utf16.size * 5);
- char *temp(new(pool) char[size]);
+ char *temp(new(pool) char[size + 1]);
const uint16_t *lhs(utf16.data);
uint8_t *rhs(reinterpret_cast<uint8_t *>(temp));
CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8) {
// XXX: this is wrong
size_t size(utf8.size * 5);
- uint16_t *temp(new (pool) uint16_t[size]);
+ uint16_t *temp(new (pool) uint16_t[size + 1]);
const uint8_t *lhs(reinterpret_cast<const uint8_t *>(utf8.data));
uint16_t *rhs(temp);
return false;
}
/* }}} */
-/* JavaScript *ify {{{ */
-void CYStringify(std::ostringstream &str, const char *data, size_t size) {
- unsigned quot(0), apos(0);
- for (const char *value(data), *end(data + size); value != end; ++value)
- if (*value == '"')
- ++quot;
- else if (*value == '\'')
- ++apos;
-
- bool single(quot > apos);
-
- str << (single ? '\'' : '"');
-
- for (const char *value(data), *end(data + size); value != end; ++value)
- switch (uint8_t next = *value) {
- case '\\': str << "\\\\"; break;
- case '\b': str << "\\b"; break;
- case '\f': str << "\\f"; break;
- case '\n': str << "\\n"; break;
- case '\r': str << "\\r"; break;
- case '\t': str << "\\t"; break;
- case '\v': str << "\\v"; break;
-
- case '"':
- if (!single)
- str << "\\\"";
- else goto simple;
- break;
-
- case '\'':
- if (single)
- str << "\\'";
- else goto simple;
- break;
-
- case '\0':
- if (value[1] >= '0' && value[1] <= '9')
- str << "\\x00";
- else
- str << "\\0";
- break;
-
- default:
- 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 ? '\'' : '"');
-}
-
-void CYNumerify(std::ostringstream &str, double value) {
- char string[32];
- // XXX: I want this to print 1e3 rather than 1000
- sprintf(string, "%.17g", value);
- str << string;
-}
bool CYIsKey(CYUTF8String value) {
const char *data(value.data);
return true;
}
-/* }}} */
-
-double CYCastDouble(const char *value, size_t size) {
- char *end;
- double number(strtod(value, &end));
- if (end != value + size)
- return NAN;
- return number;
-}
-double CYCastDouble(const char *value) {
- return CYCastDouble(value, strlen(value));
+_visible bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle) {
+ return haystack.size >= needle.size && strncmp(haystack.data, needle.data, needle.size) == 0;
}
-CYUTF8String CYPoolCode(CYPool &pool, std::istream &stream) {
+CYUTF8String CYPoolCode(CYPool &pool, std::streambuf &stream) {
CYLocalPool local;
CYDriver driver(local, stream);
- _assert(!driver.Parse());
- _assert(driver.errors_.empty());
+
+ if (driver.Parse()) {
+ if (!driver.errors_.empty())
+ CYThrow("%s", driver.errors_.front().message_.c_str());
+ CYThrow("syntax error");
+ }
CYOptions options;
CYContext context(options);
std::stringbuf str;
CYOutput out(str, options);
out << *driver.script_;
- return $pool.strdup(str.str().c_str());
+ return pool.strdup(str.str().c_str());
+}
+
+CYUTF8String CYPoolCode(CYPool &pool, CYUTF8String code) {
+ CYStream stream(code.data, code.data + code.size);
+ return CYPoolCode(pool, stream);
}
CYPool &CYGetGlobalPool() {
static CYPool pool;
return pool;
}
-
-_visible void CYThrow(const char *format, ...) {
- va_list args;
- va_start(args, format);
- throw CYPoolError(format, args);
- // XXX: does this matter? :(
- va_end(args);
-}
-
-const char *CYPoolError::PoolCString(CYPool &pool) const {
- return pool.strdup(message_);
-}
-
-CYPoolError::CYPoolError(const CYPoolError &rhs) :
- message_(pool_.strdup(rhs.message_))
-{
-}
-
-CYPoolError::CYPoolError(const char *format, ...) {
- va_list args;
- va_start(args, format);
- // XXX: there might be a beter way to think about this
- message_ = pool_.vsprintf(64, format, args);
- va_end(args);
-}
-
-CYPoolError::CYPoolError(const char *format, va_list args) {
- // XXX: there might be a beter way to think about this
- message_ = pool_.vsprintf(64, format, args);
-}
projects / cycript.git / blobdiff