aboutsummaryrefslogtreecommitdiffhomepage
path: root/parser.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2012-11-10 21:05:39 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2012-11-10 21:05:39 +0100
commit9260afbf9f178bc67728f63222fa1279b1d98b94 (patch)
tree9065349c275df0b86213562748045d54d27e4db1 /parser.cpp
parenta59315f2f37b99dcee66ce0e875838b4a28ee253 (diff)
downloadsciteco-9260afbf9f178bc67728f63222fa1279b1d98b94.tar.gz
use namespace for Modifiers instead of structure
Diffstat (limited to 'parser.cpp')
-rw-r--r--parser.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/parser.cpp b/parser.cpp
index 256356d..34d686f 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -14,10 +14,10 @@ States states;
State *current_state = &states.start;
-static struct {
- bool colon;
- bool at;
-} modifiers = {false, false};
+namespace Modifiers {
+ static bool colon = false;
+ static bool at = false;
+}
enum Mode mode = MODE_NORMAL;
@@ -55,11 +55,11 @@ State::State()
bool
State::eval_colon(void)
{
- if (!modifiers.colon)
+ if (!Modifiers::colon)
return false;
- undo.push_var<bool>(modifiers.colon);
- modifiers.colon = false;
+ undo.push_var<bool>(Modifiers::colon);
+ Modifiers::colon = false;
return true;
}
@@ -119,9 +119,9 @@ StateExpectString::custom(gchar chr)
/*
* String termination handling
*/
- if (modifiers.at) {
- undo.push_var<bool>(modifiers.at);
- modifiers.at = false;
+ if (Modifiers::at) {
+ undo.push_var<bool>(Modifiers::at);
+ Modifiers::at = false;
undo.push_var<gchar>(escape_char);
escape_char = g_ascii_toupper(chr);
@@ -392,14 +392,14 @@ StateStart::custom(gchar chr)
*/
case '@':
BEGIN_EXEC(this);
- undo.push_var<bool>(modifiers.at);
- modifiers.at = true;
+ undo.push_var<bool>(Modifiers::at);
+ Modifiers::at = true;
break;
case ':':
BEGIN_EXEC(this);
- undo.push_var<bool>(modifiers.colon);
- modifiers.colon = true;
+ undo.push_var<bool>(Modifiers::colon);
+ Modifiers::colon = true;
break;
/*