C++ problems

Author: xFrednet

src/lang/interpreter.cc

@@ -68,7 +68,14 @@ namespace verona::interpreter
 
     InterpreterFrame* top_frame()
     {
-      return frame_stack.back();
+      if (frame_stack.empty())
+      {
+        return nullptr;
+      }
+      else
+      {
+        return frame_stack.back();
+      }
     }
 
     InterpreterFrame* push_stack_frame(trieste::Node body)

src/lang/passes/parse.cc

@@ -96,7 +96,7 @@ trieste::Parse parser()
       "(?:#[^\\n\\r]*)" >> [](auto&) {},
 
       "def\\b" >> [](auto& m) { m.seq(Func); },
-      "@name\\(\"([0-9A-Za-z_]+)\"\\)" >> [](auto& m) { m.add(Name, 1); },
+      "@name\\(\"([^\\n\"]+)\"\\)" >> [](auto& m) { m.add(Name, 1); },
       "when\\b" >> [](auto& m) { m.seq(When); },
       "\\(" >> [](auto& m) { m.push(Parens); },
       "\\)" >>

src/rt/rt.cc

@@ -361,7 +361,7 @@ namespace rt
 
   int get_cown_id(objects::DynObject* cown)
   {
-    if (cown->get_prototype() != core::cownPrototypeObject())
+    if (cown && cown->get_prototype() != core::cownPrototypeObject())
     {
       ui::error("The given object is not a cown", cown);
     }