[seed] Revert "Clean up 'seed' interpreter"
- From: Tim Horton <hortont src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [seed] Revert "Clean up 'seed' interpreter"
- Date: Tue, 25 Aug 2009 02:00:58 +0000 (UTC)
commit 2daaf7d97a4bfed44c554c38309243d811346a58
Author: Tim Horton <hortont svn gnome org>
Date: Mon Aug 24 22:00:06 2009 -0400
Revert "Clean up 'seed' interpreter"
This reverts commit c061547a7953fc7072b9e0043d0f5c33c7f3ec10.
src/main.c | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/src/main.c b/src/main.c
index 8659678..e3bf2f5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,8 +28,8 @@
SeedEngine *eng;
-static void
-seed_repl ()
+void
+seed_repl (gint argc, gchar ** argv)
{
SeedScript *script;
@@ -39,20 +39,20 @@ seed_repl ()
g_free (script);
}
-static void
-seed_exec (gchar * filename)
+void
+seed_exec (gint argc, gchar ** argv)
{
SeedObject global;
SeedScript *script;
SeedException e;
gchar *buffer;
- g_file_get_contents (filename, &buffer, 0, 0);
+ g_file_get_contents (argv[1], &buffer, 0, 0);
if (!buffer)
{
- g_critical ("File %s not found!", filename);
- exit (EXIT_FAILURE);
+ g_critical ("File %s not found!", argv[1]);
+ exit (1);
}
if (*buffer == '#')
@@ -61,22 +61,27 @@ seed_exec (gchar * filename)
buffer++;
buffer++;
}
-
- script = seed_make_script (eng->context, buffer, filename, 1);
- g_free (buffer);
-
+ script = seed_make_script (eng->context, buffer, argv[1], 1);
if ((e = seed_script_exception (script)))
{
- g_critical ("%s", seed_exception_to_string (eng->context, e));
- exit (EXIT_FAILURE);
+ g_critical ("%s. %s in %s at line %d",
+ seed_exception_get_name (eng->context, e),
+ seed_exception_get_message (eng->context, e),
+ seed_exception_get_file (eng->context, e),
+ seed_exception_get_line (eng->context, e));
+ exit (1);
}
global = seed_context_get_global_object (eng->context);
- seed_importer_add_global (global, filename);
+ seed_importer_add_global (global, argv[1]);
seed_evaluate (eng->context, script, 0);
if ((e = seed_script_exception (script)))
- g_critical ("%s", seed_exception_to_string (eng->context, e));
+ g_critical ("%s. %s in %s at line %d",
+ seed_exception_get_name (eng->context, e),
+ seed_exception_get_message (eng->context, e),
+ seed_exception_get_file (eng->context, e),
+ seed_exception_get_line (eng->context, e));
g_free (script);
}
@@ -91,9 +96,9 @@ main (gint argc, gchar ** argv)
seed_engine_set_search_path (eng, DEFAULT_PATH);
if (argc == 1)
- seed_repl ();
+ seed_repl (argc, argv);
else
- seed_exec (argv[1]);
+ seed_exec (argc, argv);
- return EXIT_SUCCESS;
+ return 0;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]