Merge pull request #14 from michaelpaulus/master

#13 Updated extensions to be internal so consuming projects don't pic…
nickhodge · Sep 25, 2023 · 5f5aff1 · 5f5aff1
2 parents 2ea5aa8 + f3a79b7
commit 5f5aff1
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 60 deletions.
diff --git a/SharpSimpleNLG/SharpSimpleNLG.csproj b/SharpSimpleNLG/SharpSimpleNLG.csproj
@@ -33,6 +33,10 @@
     <DebugSymbols>False</DebugSymbols>
   </PropertyGroup>
 
+  <ItemGroup>
+  	<InternalsVisibleTo Include="SharpSimpleNLGTests" />
+  </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Include="lexicon\default-lexicon.xml" />
   </ItemGroup>

diff --git a/SharpSimpleNLG/features/FeatureExtensions.cs b/SharpSimpleNLG/features/FeatureExtensions.cs
@@ -26,8 +26,8 @@
 
 namespace SimpleNLG.Extensions
 {
-   
-    public static class FeatureExtensions
+
+    internal static class FeatureExtensions
     {
         public static string ToString(this Feature f)
         {

diff --git a/SharpSimpleNLG/features/GenderExtensions.cs b/SharpSimpleNLG/features/GenderExtensions.cs
@@ -26,7 +26,7 @@
 
 namespace SimpleNLG.Extensions
 {
-     public static class GenderEnumExtensions
+    internal static class GenderEnumExtensions
     {
         public static int ordinal(this Gender g)
         {

diff --git a/SharpSimpleNLG/features/InternalFeatureExtension.cs b/SharpSimpleNLG/features/InternalFeatureExtension.cs
@@ -26,53 +26,53 @@
 
 namespace SimpleNLG.Extensions
 {
-      public static class InternalFeatureExtensions
-     {
-         public static string ToString(this InternalFeature intf)
-         {
-             switch (intf)
-             {
-                 case InternalFeature.ACRONYM:
-                     return "acronym";
-                 case InternalFeature.BASE_WORD:
-                     return "base_word";
-                 case InternalFeature.CLAUSE_STATUS:
-                     return "clause_status";
-                 case InternalFeature.COMPLEMENTS:
-                     return "complements";
-                 case InternalFeature.COMPONENTS:
-                     return "components";
-                 case InternalFeature.COORDINATES:
-                     return "coordinates";
-                 case InternalFeature.DISCOURSE_FUNCTION:
-                     return "discourse_function";
-                 case InternalFeature.NON_MORPH:
-                     return "non_morph";
-                 case InternalFeature.FRONT_MODIFIERS:
-                     return "front_modifiers";
-                 case InternalFeature.HEAD:
-                     return "head";
-                 case InternalFeature.IGNORE_MODAL:
-                     return "ignore_modal";
-                 case InternalFeature.INTERROGATIVE:
-                     return "interrogative";
-                 case InternalFeature.POSTMODIFIERS:
-                     return "postmodifiers";
-                 case InternalFeature.PREMODIFIERS:
-                     return "premodifiers";
-                 case InternalFeature.RAISED:
-                     return "raised";
-                 case InternalFeature.REALISE_AUXILIARY:
-                     return "realise_auxiliary";
-                 case InternalFeature.SPECIFIER:
-                     return "specifier";
-                 case InternalFeature.SUBJECTS:
-                     return "subjects";
-                 case InternalFeature.VERB_PHRASE:
-                     return "verb_phrase";
-                 default:
-                     return "";
-             }
-         }
-     }
+    internal static class InternalFeatureExtensions
+    {
+        public static string ToString(this InternalFeature intf)
+        {
+            switch (intf)
+            {
+                case InternalFeature.ACRONYM:
+                    return "acronym";
+                case InternalFeature.BASE_WORD:
+                    return "base_word";
+                case InternalFeature.CLAUSE_STATUS:
+                    return "clause_status";
+                case InternalFeature.COMPLEMENTS:
+                    return "complements";
+                case InternalFeature.COMPONENTS:
+                    return "components";
+                case InternalFeature.COORDINATES:
+                    return "coordinates";
+                case InternalFeature.DISCOURSE_FUNCTION:
+                    return "discourse_function";
+                case InternalFeature.NON_MORPH:
+                    return "non_morph";
+                case InternalFeature.FRONT_MODIFIERS:
+                    return "front_modifiers";
+                case InternalFeature.HEAD:
+                    return "head";
+                case InternalFeature.IGNORE_MODAL:
+                    return "ignore_modal";
+                case InternalFeature.INTERROGATIVE:
+                    return "interrogative";
+                case InternalFeature.POSTMODIFIERS:
+                    return "postmodifiers";
+                case InternalFeature.PREMODIFIERS:
+                    return "premodifiers";
+                case InternalFeature.RAISED:
+                    return "raised";
+                case InternalFeature.REALISE_AUXILIARY:
+                    return "realise_auxiliary";
+                case InternalFeature.SPECIFIER:
+                    return "specifier";
+                case InternalFeature.SUBJECTS:
+                    return "subjects";
+                case InternalFeature.VERB_PHRASE:
+                    return "verb_phrase";
+                default:
+                    return "";
+            }
+        }
+    }
 }
diff --git a/SharpSimpleNLG/features/InterrogativeTypeExtensions.cs b/SharpSimpleNLG/features/InterrogativeTypeExtensions.cs
@@ -37,7 +37,7 @@ namespace SimpleNLG.Extensions
      *         <code>false</code> otherwise.
      */
 
-    public static class InterrogativeTypeExtensions
+    internal static class InterrogativeTypeExtensions
     {
         /**
          * A method to determine if the {@code InterrogativeType} is a question

diff --git a/SharpSimpleNLG/features/PersonExtensions.cs b/SharpSimpleNLG/features/PersonExtensions.cs
@@ -26,7 +26,7 @@
 
 namespace SimpleNLG.Extensions
 {
-    public static class PersonEnumExtensions
+    internal static class PersonEnumExtensions
     {
         public static int ordinal(this Person p)
         {

diff --git a/SharpSimpleNLG/features/TenseExtensions.cs b/SharpSimpleNLG/features/TenseExtensions.cs
@@ -27,8 +27,8 @@
 
 namespace SimpleNLG.Extensions
 {
- 
-    public static class TenseExtensions
+
+    internal static class TenseExtensions
     {
         public static Tense ToTense(this string s)
         {

diff --git a/SharpSimpleNLG/framework/DocumentCategory.cs b/SharpSimpleNLG/framework/DocumentCategory.cs
@@ -32,7 +32,7 @@ public interface IDocumentCategory: IElementCategory
     }
 
 
-    public static class DocumentCategoryExtensions {
+    internal static class DocumentCategoryExtensions {
         public static bool hasSubPart(this IElementCategory sourceElementCategory, IElementCategory elementCategory)
         {
             var subPart = false;

diff --git a/SharpSimpleNLG/helperextensions/EqualsExtensions.cs b/SharpSimpleNLG/helperextensions/EqualsExtensions.cs
@@ -29,7 +29,7 @@
 
 namespace SimpleNLG.Extensions
 {
-    public static class EqualsExtensions
+    internal static class EqualsExtensions
     {
         public static bool equals(this Dictionary<string, object> s, Dictionary<string, object> d)
         {

diff --git a/SharpSimpleNLG/helperextensions/HelperExtensions.cs b/SharpSimpleNLG/helperextensions/HelperExtensions.cs
@@ -37,8 +37,8 @@ the source of the call to pure-er C# to reduce call depth/stack use
      Not a complete implementation of C# to Java - just for SimpleNLG
      Nick Hodge [email protected]
     */
-    
-    public static class HelperExtensions
+
+    internal static class HelperExtensions
     {
         // for chars 
         public static bool isDigit(this char c)