Merge pull request #747 from Squamanto/remove-scope-token

Removed C/C++ "scope" token

languages/cpp/src/main/java/de/jplag/cpp/CPPTokenType.java

@@ -5,7 +5,6 @@ import de.jplag.TokenType;
 public enum CPPTokenType implements TokenType {
     C_BLOCK_BEGIN("BLOCK{"),
     C_BLOCK_END("}BLOCK"),
-    C_SCOPE("SCOPE"),
     C_QUESTIONMARK("COND"),
     C_ELLIPSIS("..."),
     C_ASSIGN("ASSIGN"),

languages/cpp/src/main/javacc/CPP.jj

@@ -282,7 +282,7 @@ void token(): {}
 | "]"
 | "("
 | ")"
-| "::"           { delegatingScanner.add(C_SCOPE,token); }
+| "::"
 | ":"
 | ";"
 | ","