Fix semicolons yet again (GH #889)

So it looks like sed added a '\r' between the closing paren and the semi. Grepping for '^;' failed because the '\r' was considered part of the previous line, so it showed no hits. I finally had to write a C program to properly identify and fix those damn stray semicolons.

1 files changed, 10 insertions, 10 deletions

diff --git a/cham.cpp b/cham.cpp
index ace0f07a..620b7953 100644
--- a/cham.cpp
+++ b/cham.cpp
@@ -45,11 +45,11 @@ using CryptoPP::rotrConstant;
 template <unsigned int RR, unsigned int KW, class T>

 inline void CHAM_EncRound(T x[4], const T k[KW], unsigned int i)

 {

-    CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4)
;

-    CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4)
;

-    CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4)
;

-    CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 1 : 8)
;

-    CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 8 : 1)
;

+    CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);

+    CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);

+    CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);

+    CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 1 : 8);

+    CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 8 : 1);

 

     // Follows conventions in the ref impl

     const T kk = k[i % KW];

@@ -79,11 +79,11 @@ inline void CHAM_EncRound(T x[4], const T k[KW], unsigned int i)
 template <unsigned int RR, unsigned int KW, class T>

 inline void CHAM_DecRound(T x[4], const T k[KW], unsigned int i)

 {

-    CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4)
;

-    CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4)
;

-    CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4)
;

-    CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 8 : 1)
;

-    CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 1 : 8)
;

+    CRYPTOPP_CONSTANT(IDX0 = (RR+0) % 4);

+    CRYPTOPP_CONSTANT(IDX1 = (RR+1) % 4);

+    CRYPTOPP_CONSTANT(IDX3 = (RR+3+1) % 4);

+    CRYPTOPP_CONSTANT(R1 = (RR % 2 == 0) ? 8 : 1);

+    CRYPTOPP_CONSTANT(R2 = (RR % 2 == 0) ? 1 : 8);

 

     // Follows conventions in the ref impl

     const T kk = k[i % KW];