Changeset 197:5893bacaa720 in lemon-main

Timestamp:

07/08/08 14:57:44 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Set inline functions in header files (ticket #115)

Location:

lemon

Files:

• lgf_reader.h (modified) (4 diffs)
• lgf_writer.h (modified) (3 diffs)

lemon/lgf_reader.h

@@ -196 +196 @@
     };
 
-    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') || 
@@ -216 +216 @@
     }
     
-    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';
@@ -223 +223 @@
     }
 
-    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))
@@ -285 +285 @@
     }
     
-    std::istream& readToken(std::istream& is, std::string& str) {
+    inline std::istream& readToken(std::istream& is, std::string& str) {
       std::ostringstream os;
 

lemon/lgf_writer.h

@@ -226 +226 @@
     };
 
-    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 '\\':
@@ -277 +277 @@
     }
 
-    bool requireEscape(const std::string& str) {
+    inline bool requireEscape(const std::string& str) {
       if (str.empty() || str[0] == '@') return true;
       std::istringstream is(str);
@@ -289 +289 @@
     }
     
-    std::ostream& writeToken(std::ostream& os, const std::string& str) {
+    inline std::ostream& writeToken(std::ostream& os, const std::string& str) {
 
       if (requireEscape(str)) {