Revision: 6642
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=6642&view=rev
Author:   dnaber
Date:     2012-03-25 00:14:12 +0000 (Sun, 25 Mar 2012)
Log Message:
-----------
fix rest of bug #3396850: no false alarm on "that that" and "had had"

Modified Paths:
--------------
    trunk/JLanguageTool/src/java/org/languagetool/language/English.java

Added Paths:
-----------
    
trunk/JLanguageTool/src/java/org/languagetool/rules/en/EnglishWordRepeatRule.java

Modified: trunk/JLanguageTool/src/java/org/languagetool/language/English.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/language/English.java 
2012-03-25 00:09:37 UTC (rev 6641)
+++ trunk/JLanguageTool/src/java/org/languagetool/language/English.java 
2012-03-25 00:14:12 UTC (rev 6642)
@@ -22,10 +22,7 @@
 
 import org.languagetool.Language;
 import org.languagetool.rules.*;
-import org.languagetool.rules.en.AvsAnRule;
-import org.languagetool.rules.en.CompoundRule;
-import org.languagetool.rules.en.EnglishUnpairedBracketsRule;
-import org.languagetool.rules.en.EnglishWordRepeatBeginningRule;
+import org.languagetool.rules.en.*;
 import org.languagetool.synthesis.Synthesizer;
 import org.languagetool.synthesis.en.EnglishSynthesizer;
 import org.languagetool.tagging.Tagger;
@@ -119,7 +116,7 @@
             EnglishUnpairedBracketsRule.class,
             UppercaseSentenceStartRule.class,
             WhitespaceRule.class,
-            WordRepeatRule.class,
+            EnglishWordRepeatRule.class,
             LongSentenceRule.class,
             // specific to English:
             AvsAnRule.class,

Added: 
trunk/JLanguageTool/src/java/org/languagetool/rules/en/EnglishWordRepeatRule.java
===================================================================
--- 
trunk/JLanguageTool/src/java/org/languagetool/rules/en/EnglishWordRepeatRule.java
                           (rev 0)
+++ 
trunk/JLanguageTool/src/java/org/languagetool/rules/en/EnglishWordRepeatRule.java
   2012-03-25 00:14:12 UTC (rev 6642)
@@ -0,0 +1,56 @@
+/* LanguageTool, a natural language style checker
+ * Copyright (C) 2012 Daniel Naber (http://www.danielnaber.de)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+package org.languagetool.rules.en;
+
+import org.languagetool.AnalyzedTokenReadings;
+import org.languagetool.Language;
+import org.languagetool.rules.WordRepeatRule;
+
+import java.util.ResourceBundle;
+
+/**
+ * Avoid false alarms in the word repetition rule.
+ */
+public class EnglishWordRepeatRule extends WordRepeatRule {
+
+  public EnglishWordRepeatRule(final ResourceBundle messages, final Language 
language) {
+    super(messages, language);
+  }
+
+  @Override
+  public String getId() {
+    return "ENGLISH_WORD_REPEAT_RULE";
+  }
+
+  @Override
+  public boolean ignore(AnalyzedTokenReadings[] tokens, int position) {
+    if (wordRepetitionOf("had", tokens, position)) {
+      return true;   // "If I had had time, I would have gone to see him."
+    }
+    if (wordRepetitionOf("that", tokens, position)) {
+      return true;   // "I don't think that that is a problem."
+    }
+    return false;
+  }
+
+  private boolean wordRepetitionOf(String word, AnalyzedTokenReadings[] 
tokens, int position) {
+    return position > 0 && tokens[position - 1].getToken().equals(word) && 
tokens[position].getToken().equals(word);
+  }
+
+}

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs

Reply via email to