[Minor] Try to fix build with Ragel 7

diff --git a/src/ragel/content_disposition.rl b/src/ragel/content_disposition.rl
index 5aca57db51d48f83786574650a1432616749a346..614d54c68b62bfddebf6e89121961e548158088d 100644 (file)
--- a/src/ragel/content_disposition.rl
+++ b/src/ragel/content_disposition.rl
@@ -1,6 +1,5 @@
 %%{
   machine content_disposition;
-  include smtp_whitespace "smtp_whitespace.rl";
 
   # https://tools.ietf.org/html/rfc2045#section-5.1
 

diff --git a/src/ragel/content_disposition_parser.rl b/src/ragel/content_disposition_parser.rl
index 71b999ce419fc38fe8c83447b9cb703b07f13c04..c35d2b2320aa435ae48899a1a5d40ec9ff7f32cb 100644 (file)
--- a/src/ragel/content_disposition_parser.rl
+++ b/src/ragel/content_disposition_parser.rl
@@ -86,7 +86,7 @@
     }
   }
 
-
+  include smtp_whitespace "smtp_whitespace.rl";
   include content_disposition "content_disposition.rl";
 
   main := content_disposition;

diff --git a/src/ragel/smtp_addr_parser.rl b/src/ragel/smtp_addr_parser.rl
index 91b100af7ee1ac650b971467335fe2c66c3caa69..737b4ddcd84fdbe06556f27af3214703685becee 100644 (file)
--- a/src/ragel/smtp_addr_parser.rl
+++ b/src/ragel/smtp_addr_parser.rl
@@ -2,6 +2,8 @@
 
   machine smtp_addr_parser;
 
+
+
   action IP6_start {}
   action IP6_end {}
   action IP4_start {}
@@ -73,6 +75,8 @@
     }
   }
 
+  include smtp_ip "smtp_ip.rl";
+  include smtp_whitespace "smtp_whitespace.rl";
   include smtp_address "smtp_address.rl";
 
   main := SMTPAddr;

diff --git a/src/ragel/smtp_address.rl b/src/ragel/smtp_address.rl
index 736c28b0e9bda94abd66fba91478af10d019e7ab..4ea64eddfdbcf0b751e28d30debb7e5996d97923 100644 (file)
--- a/src/ragel/smtp_address.rl
+++ b/src/ragel/smtp_address.rl
@@ -1,9 +1,6 @@
 %%{
   machine smtp_address;
 
-  include smtp_ip "smtp_ip.rl";
-  include smtp_whitespace "smtp_whitespace.rl";
-
   # SMTP address spec
   # Obtained from: https://tools.ietf.org/html/rfc5321#section-4.1.2
 

diff --git a/src/ragel/smtp_date.rl b/src/ragel/smtp_date.rl
index 69227ef1ee79de4dda1057681b4d079ce680506f..35ed7499c801ae6b3268cf88d484eb0bd1d60159 100644 (file)
--- a/src/ragel/smtp_date.rl
+++ b/src/ragel/smtp_date.rl
@@ -1,8 +1,6 @@
 %%{
   machine smtp_date;
 
-  include smtp_whitespace "smtp_whitespace.rl";
-
   # SMTP date spec
   # Obtained from: http://tools.ietf.org/html/rfc5322#section_3.3
 

diff --git a/src/ragel/smtp_date_parser.rl b/src/ragel/smtp_date_parser.rl
index 84b63f1bde49f829667aececb5c14162a1851f52..bc6e5c8f06f9018abb36cccf7cf9140e22f9a2c4 100644 (file)
--- a/src/ragel/smtp_date_parser.rl
+++ b/src/ragel/smtp_date_parser.rl
@@ -1,6 +1,7 @@
 %%{
 
   machine smtp_date_parser;
+  include smtp_whitespace "smtp_whitespace.rl";
   include smtp_date "smtp_date.rl";
 
   main := date_time;

diff --git a/src/ragel/smtp_received.rl b/src/ragel/smtp_received.rl
index cd912db4d0d2af644dbc33afce7d7672f22eaa95..12aaeb08cec743a5acb76d604e7b8ac42f57a6f8 100644 (file)
--- a/src/ragel/smtp_received.rl
+++ b/src/ragel/smtp_received.rl
@@ -1,10 +1,6 @@
 %%{
   machine smtp_received;
 
-  include smtp_whitespace "smtp_whitespace.rl";
-  include smtp_ip "smtp_ip.rl";
-  include smtp_date "smtp_date.rl";
-  include smtp_address"smtp_address.rl";
 
   # http://tools.ietf.org/html/rfc5321#section-4.4
 

diff --git a/src/ragel/smtp_received_parser.rl b/src/ragel/smtp_received_parser.rl
index c1cd9bc38ecac9c000f01d03935aeb4d0030053c..565a20b7fbd6390e4989084f36007c7d737e7982 100644 (file)
--- a/src/ragel/smtp_received_parser.rl
+++ b/src/ragel/smtp_received_parser.rl
@@ -225,6 +225,10 @@
     }
   }
 
+  include smtp_whitespace "smtp_whitespace.rl";
+  include smtp_ip "smtp_ip.rl";
+  include smtp_date "smtp_date.rl";
+  include smtp_address"smtp_address.rl";
   include smtp_received "smtp_received.rl";
 
   main := Received;