fix macro-define fail with '/' char when comment(/**/) in last line

Author: sanikoyes

cpptoxml/parser/rpp/pp-engine-bits.h

@@ -606,9 +606,11 @@ _InputIterator pp::handle_define (_InputIterator __first, _InputIterator __last)
     {
     if (*__first == '/') {
         __first = skip_comment_or_divop(__first, __last);
-        if (skip_comment_or_divop.lines == 0)
-            definition += '/';
-        else
+        if (skip_comment_or_divop.lines == 0) {
+            if (skip_comment_or_divop.state != skip_comment_or_divop.END) {
+              definition += '/';
+            }
+        } else
             env.current_line += skip_comment_or_divop.lines;
     }
 

cpptoxml/parser/rpp/pp-scanner.h

@@ -69,19 +69,20 @@ struct pp_skip_comment_or_divop
 {
   int lines;
 
+  enum {
+    MAYBE_BEGIN,
+    BEGIN,
+    MAYBE_END,
+    END,
+    IN_COMMENT,
+    IN_CXX_COMMENT
+  } state;
+
   template <typename _InputIterator>
   _InputIterator operator () (_InputIterator __first, _InputIterator __last)
   {
-    enum {
-      MAYBE_BEGIN,
-      BEGIN,
-      MAYBE_END,
-      END,
-      IN_COMMENT,
-      IN_CXX_COMMENT
-    } state (MAYBE_BEGIN);
-
     lines = 0;
+    state = MAYBE_BEGIN;
 
     for (; __first != __last; lines += (*__first != '\n' ? 0 : 1), ++__first)
       {