[Lemon-commits] Alpar Juttner: Merge

[Lemon HG]

details:   http://lemon.cs.elte.hu/hg/lemon/rev/e80e08222fdf
changeset: 198:e80e08222fdf
user:      Alpar Juttner <alpar [at] cs.elte.hu>
date:      Wed Jul 09 07:57:53 2008 +0200
description:
	Merge

diffstat:

2 files changed, 14 insertions(+), 14 deletions(-)
lemon/lgf_reader.h |   18 +++++++++---------
lemon/lgf_writer.h |   10 +++++-----

diffs (107 lines):

diff -r 420013ff029b -r e80e08222fdf lemon/lgf_reader.h
--- a/lemon/lgf_reader.h	Wed Jul 09 07:57:09 2008 +0200
+++ b/lemon/lgf_reader.h	Wed Jul 09 07:57:53 2008 +0200
@@ -195,44 +195,44 @@
       }
     };
 
-    bool isWhiteSpace(char c) {
+    inline bool isWhiteSpace(char c) {
       return c == ' ' || c == '\t' || c == '\v' || 
         c == '\n' || c == '\r' || c == '\f'; 
     }
     
-    bool isOct(char c) {
+    inline bool isOct(char c) {
       return '0' <= c && c <='7'; 
     }
     
-    int valueOct(char c) {
+    inline int valueOct(char c) {
       LEMON_ASSERT(isOct(c), "The character is not octal.");
       return c - '0';
     }
 
-    bool isHex(char c) {
+    inline bool isHex(char c) {
       return ('0' <= c && c <= '9') || 
 	('a' <= c && c <= 'z') || 
 	('A' <= c && c <= 'Z'); 
     }
     
-    int valueHex(char c) {
+    inline int valueHex(char c) {
       LEMON_ASSERT(isHex(c), "The character is not hexadecimal.");
       if ('0' <= c && c <= '9') return c - '0';
       if ('a' <= c && c <= 'z') return c - 'a' + 10;
       return c - 'A' + 10;
     }
 
-    bool isIdentifierFirstChar(char c) {
+    inline bool isIdentifierFirstChar(char c) {
       return ('a' <= c && c <= 'z') ||
 	('A' <= c && c <= 'Z') || c == '_';
     }
 
-    bool isIdentifierChar(char c) {
+    inline bool isIdentifierChar(char c) {
       return isIdentifierFirstChar(c) ||
 	('0' <= c && c <= '9');
     }
 
-    char readEscape(std::istream& is) {
+    inline char readEscape(std::istream& is) {
       char c;
       if (!is.get(c))
 	throw DataFormatError("Escape format error");
@@ -284,7 +284,7 @@
       } 
     }
     
-    std::istream& readToken(std::istream& is, std::string& str) {
+    inline std::istream& readToken(std::istream& is, std::string& str) {
       std::ostringstream os;
 
       char c;
diff -r 420013ff029b -r e80e08222fdf lemon/lgf_writer.h
--- a/lemon/lgf_writer.h	Wed Jul 09 07:57:09 2008 +0200
+++ b/lemon/lgf_writer.h	Wed Jul 09 07:57:53 2008 +0200
@@ -225,17 +225,17 @@
       }
     };
 
-    bool isWhiteSpace(char c) {
+    inline bool isWhiteSpace(char c) {
       return c == ' ' || c == '\t' || c == '\v' || 
         c == '\n' || c == '\r' || c == '\f'; 
     }
 
-    bool isEscaped(char c) {
+    inline bool isEscaped(char c) {
       return c == '\\' || c == '\"' || c == '\'' || 
 	c == '\a' || c == '\b';
     }
 
-    static void writeEscape(std::ostream& os, char c) {
+    inline static void writeEscape(std::ostream& os, char c) {
       switch (c) {
       case '\\':
 	os << "\\\\";
@@ -276,7 +276,7 @@
       }     
     }
 
-    bool requireEscape(const std::string& str) {
+    inline bool requireEscape(const std::string& str) {
       if (str.empty() || str[0] == '@') return true;
       std::istringstream is(str);
       char c;
@@ -288,7 +288,7 @@
       return false;
     }
     
-    std::ostream& writeToken(std::ostream& os, const std::string& str) {
+    inline std::ostream& writeToken(std::ostream& os, const std::string& str) {
 
       if (requireEscape(str)) {
 	os << '\"';