From df9f83a249e59867373e06c79aa8f57a5c9640b7 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 20 Nov 2012 01:57:14 +0100 Subject: cleanup macro execution functions: common namespace, Execute::file() uses Execute::macro() --- parser.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'parser.h') diff --git a/parser.h b/parser.h index 2451a58..819e418 100644 --- a/parser.h +++ b/parser.h @@ -236,8 +236,6 @@ private: State *done(const gchar *str) throw (Error); }; -extern gint macro_pc; - namespace States { extern StateStart start; extern StateControl control; @@ -263,10 +261,15 @@ extern enum Mode { return STATE; \ } G_STMT_END +extern gint macro_pc; + extern gchar *strings[2]; extern gchar escape_char; -void macro_execute(const gchar *macro) throw (State::Error); -bool file_execute(const gchar *filename, bool locals = true); +namespace Execute { + void step(const gchar *macro) throw (State::Error); + void macro(const gchar *macro, bool locals = true) throw (State::Error); + bool file(const gchar *filename, bool locals = true); +} #endif -- cgit v1.2.3