Changeset 14135 for trunk/FACT++/src/InterpreterV8.cc

Timestamp:

06/08/12 22:01:56 (12 years ago)

Author:

tbretz

Message:

Added a function dim.out which will only print to the local console; improved conversion from dim service elements to ECMA numbers

File:

• trunk/FACT++/src/InterpreterV8.cc (modified) (4 diffs)

trunk/FACT++/src/InterpreterV8.cc

@@ -257 +257 @@
 }
 
+Handle<Value> InterpreterV8::FuncOut(const Arguments& args)
+{
+    for (int i=0; i<args.Length(); i++)
+    {
+        const HandleScope handle_scope;
+
+        const String::Utf8Value str(args[i]);
+        if (*str)
+            JsOut(*str);
+    }
+    return Undefined();
+}
+
 // The callback that is invoked by v8 whenever the JavaScript 'load'
 // function is called.  Loads, compiles and executes its argument
@@ -283 +296 @@
 Handle<Value> Convert(char type, const char* &ptr)
 {
+    // Dim values are always unsigned per (FACT++) definition
     switch (type)
     {
-    case 'F':  { Handle<Value> v=Number::New(*reinterpret_cast<const float*>(ptr));    ptr+=4; return v; }
-    case 'D':  { Handle<Value> v=Number::New(*reinterpret_cast<const double*>(ptr));   ptr+=8; return v; }
-    case 'I':  {
-    case 'L':    Handle<Value> v=Integer::New(*reinterpret_cast<const uint32_t*>(ptr)); ptr += 4; return v; }
-    case 'X':  { Handle<Value> v=Integer::New(*reinterpret_cast<const uint64_t*>(ptr)); ptr += 8; return v; }
-    case 'S':  { Handle<Value> v=Integer::New(*reinterpret_cast<const uint16_t*>(ptr)); ptr += 2; return v; }
-    case 'C':  { Handle<Value> v=Integer::New((uint16_t)*reinterpret_cast<const uint8_t*>(ptr));  ptr += 1; return v; }
+    case 'F':
+        {
+            // Remove the "imprecision" effect coming from casting a float to
+            // a double and then showing it with double precision
+            ostringstream val;
+            val << setprecision(7) << *reinterpret_cast<const float*>(ptr);
+            Handle<Value> v=Number::New(stod(val.str()));
+            ptr+=4;
+            return v;
+        }
+    case 'D':  { Handle<Value> v=Number::New(*reinterpret_cast<const double*>(ptr)); ptr+=8; return v; }
+    case 'I':
+    case 'L':  { Handle<Value> v=Integer::NewFromUnsigned(*reinterpret_cast<const uint32_t*>(ptr)); ptr += 4; return v; }
+    case 'X':
+        {
+            const uint64_t val = *reinterpret_cast<const uint64_t*>(ptr);
+            ptr += 8;
+            if (val>UINT32_MAX)
+                return Number::New(val);
+            return Integer::NewFromUnsigned(val);
+        }
+    case 'S':  { Handle<Value> v=Integer::NewFromUnsigned(*reinterpret_cast<const uint16_t*>(ptr)); ptr += 2; return v; }
+    case 'C':  { Handle<Value> v=Integer::NewFromUnsigned((uint16_t)*reinterpret_cast<const uint8_t*>(ptr));  ptr += 1; return v; }
     case ':':  { Handle<Value> v=String::New(ptr); return v; }
     }
@@ -448 +478 @@
     Handle<ObjectTemplate> dim = ObjectTemplate::New();
     dim->Set(String::New("print"),   FunctionTemplate::New(WrapPrint), ReadOnly);
+    dim->Set(String::New("out"),     FunctionTemplate::New(WrapOut),   ReadOnly);
     dim->Set(String::New("wait"),    FunctionTemplate::New(WrapWait),  ReadOnly);
     dim->Set(String::New("send"),    FunctionTemplate::New(WrapSend),  ReadOnly);
@@ -486 +517 @@
     //context.Dispose();
 
-    cout << "JsEnd" << endl;
     JsEnd(filename);