Changeset 180

Timestamp:

Jan 7, 2007, 5:27:39 PM (19 years ago)

Author:

cinc

Message:

A load of additions and fixes to the string and path classes.

Location:

trunk/foundation

Files:

• class_c/nomfilepath.c (modified) (6 diffs)
• class_c/nomstring.c (modified) (4 diffs)
• idl/nomfilepath.idl (modified) (1 diff)
• idl/nomstring.idl (modified) (1 diff)

trunk/foundation/class_c/nomfilepath.c

@@ -52 +52 @@
   input the resulting path may not be valid.
 
-  The method returns the NOMPath instance after appending.
+  The method returns a new NOMPath after appending.
  */
 NOM_Scope PNOMPath NOMLINK impl_NOMPath_appendPath(NOMPath* nomSelf, const PNOMPath nomPath, CORBA_Environment *ev)
@@ -59 +59 @@
 
   if(!nomPath)
-    return nomSelf;
+    return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
 
   if(0==NOMPath_length((NOMString*)nomPath, ev))
@@ -69 +69 @@
     NOMPath_appendSeparator(nomSelf, ev); /* Make sure current path has a separator */
 
-  return (NOMPath*) NOMPath_appendString((NOMString*) nomSelf, (NOMString*)nomPath, NULLHANDLE);
+  return (NOMPath*) NOMPath_append((NOMString*) nomSelf, (NOMString*)nomPath, NULLHANDLE);
 }
 
 /*
   Append a separator to the path. If the path already has a separator at the end this method does
-  nothing other than returning the path.
+  nothing other than returning a new path object. If the given path has zero length a path object
+  only holding a separator is returned.
+ 
+  This method always returns a new instance of a NOMPath owned by the caller.
 */
 NOM_Scope PNOMPath NOMLINK impl_NOMPath_appendSeparator(NOMPath* nomSelf, CORBA_Environment *ev)
@@ -80 +83 @@
   gchar*  chrTemp;
   gulong len;
-  
+
   if((len=NOMPath_length((NOMString*)nomSelf, ev))==0)
     return (NOMPath*)NOMPath_appendCString((NOMString*)nomSelf, G_DIR_SEPARATOR_S, ev);
@@ -87 +90 @@
     return (NOMPath*)NOMPath_appendCString( (NOMString*)nomSelf, G_DIR_SEPARATOR_S, ev);
 
-  return nomSelf;
+  return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
 }
 
 /*
   Strips the path separator from the end of a path if there's one.
+
+  This method always returns a new instance of a NOMPath owned by the caller.
  */
 NOM_Scope PNOMPath NOMLINK impl_NOMPath_stripSeparator(NOMPath* nomSelf, CORBA_Environment *ev)
@@ -98 +103 @@
   gulong len;
 
-  if((len=NOMPath_length((NOMString*)nomSelf, ev))==0)
-    return nomSelf;
-
-  chrTemp=NOMPath_getCString((NOMString*)nomSelf, ev);
+  if((len=NOMPath_length((NOMString*)nomSelf, NULLHANDLE))==0)
+    return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
+
+  chrTemp=NOMPath_queryCString((NOMString*)nomSelf, NULLHANDLE);
+
   if(chrTemp[len-1]==G_DIR_SEPARATOR)
-    return (NOMPath*)NOMPath_truncateString( (NOMString*)nomSelf, len-1, ev);
-
-  return nomSelf;
-}
+    return (NOMPath*)NOMPath_truncate( (NOMString*)nomSelf, len-1, NULLHANDLE);
+
+  return (PNOMPath)NOMPath_copy(nomSelf, NULLHANDLE);
+}
+
+/*
+  Returns TRUE if the given path is absolute.
+  On OS/2 this means it starts with a letter followed by a colon.
+*/
+NOM_Scope CORBA_boolean NOMLINK impl_NOMPath_pathIsAbsolute(NOMPath* nomSelf, CORBA_Environment *ev)
+{
+  /* NOMPathData* nomThis=NOMPathGetData(nomSelf); */
+  gchar* chrString;
+
+#ifndef __OS2__
+#error !!!!! Only implemented for OS/2 !!!!!
+#endif
+
+  if(NOMPath_length(nomSelf, NULLHANDLE)<2)
+    return FALSE;
+
+  chrString=NOMPath_queryCString(nomSelf, NULLHANDLE);
+
+  if(!g_ascii_isalpha(chrString[0]) || chrString[1]!=':')
+    return FALSE;
+
+  return TRUE;
+}
+
+NOM_Scope PNOMPath NOMLINK impl_NOMPath_queryRoot(NOMPath* nomSelf, CORBA_Environment *ev)
+{
+/* NOMPathData* nomThis=NOMPathGetData(nomSelf); */
+  PNOMPath nomRetval=(PNOMPath)NOMPath_new(nomSelf, NULLHANDLE);
+  gchar os2Root[4]="a:"; /* includes padding */
+  gchar *chrTemp;
+
+#ifndef __OS2__
+#error !!!!! Only implemented for OS/2 !!!!!
+#endif
+
+  if(!NOMPath_pathIsAbsolute(nomSelf, NULLHANDLE))
+    return nomRetval; /* Return a zero length string */
+
+  chrTemp=NOMPath_queryCString(nomSelf, NULLHANDLE);
+
+  os2Root[0]=chrTemp[0];
+  return (PNOMPath) NOMPath_assignCString(nomRetval, os2Root, NULLHANDLE);
+}
+
+/*
+  This method strips all characters from the beginning of a path till the first
+  directory separator and also this first separator. If there's no separator in
+  the path a zero length path is returned.
+
+  This method always returns a new instance of a NOMPath owned by the caller.
+ */
+NOM_Scope PNOMPath NOMLINK impl_NOMPath_erasePathBegin(NOMPath* nomSelf, CORBA_Environment *ev)
+{
+  /* NOMPathData* nomThis=NOMPathGetData(nomSelf); */
+  PNOMPath nomRetval=(PNOMPath) NOMPath_new(nomSelf, NULLHANDLE);
+  gchar *chrTemp;
+
+  chrTemp=NOMPath_queryCString(nomSelf, NULLHANDLE); /* Not a copy */
+
+  while(*chrTemp!='\0' && *chrTemp!=G_DIR_SEPARATOR)
+    chrTemp++;
+
+  if(*chrTemp==G_DIR_SEPARATOR)
+    chrTemp++;
+
+  return (PNOMPath)NOMPath_assignCString(nomRetval, chrTemp, NULLHANDLE);
+}
+
+/*
+  Returns the part of the path up to the first directory separator ('\' on OS/2).
+  If there's no directory separator the whole path is returned. This method does
+  not remove the part from the given path. Use erasePathBegin() to do that.
+*/
+NOM_Scope PNOMPath NOMLINK impl_NOMPath_queryPathBegin(NOMPath* nomSelf, CORBA_Environment *ev)
+{
+/* NOMPathData* nomThis=NOMPathGetData(nomSelf); */
+  PNOMPath nomRetval=NOMPathNew();
+  gchar *chrTemp;
+
+  chrTemp=NOMPath_copyCString(nomSelf, NULLHANDLE); /* This is a copy */
+
+  while(*chrTemp!='\0' && *chrTemp!=G_DIR_SEPARATOR)
+    chrTemp++;
+  *chrTemp='\0';
+
+  nomRetval=(PNOMPath)NOMPath_assignCString(nomRetval, chrTemp, NULLHANDLE);
+
+  g_free(chrTemp);
+  return (PNOMPath) nomRetval;
+}
+

trunk/foundation/class_c/nomstring.c

@@ -45 +45 @@
 
 
-NOM_Scope PNOMString NOMLINK impl_NOMString_assignString(NOMString* nomSelf, const PNOMString nomString, CORBA_Environment *ev)
+NOM_Scope PNOMString NOMLINK impl_NOMString_assign(NOMString* nomSelf, const PNOMString nomString,
+                                                         CORBA_Environment *ev)
 {
-/* NOMStringData* nomThis=NOMStringGetData(nomSelf); */
+  /* NOMStringData* nomThis=NOMStringGetData(nomSelf); */
 
-  NOMString_assignCString(nomSelf, NOMString_getCString(nomString, NULLHANDLE), NULLHANDLE);
+  NOMString_assignCString(nomSelf, NOMString_queryCString(nomString, NULLHANDLE), NULLHANDLE);
   return nomSelf;
 }
 
-/* Assign a C string to this NOMString */
-NOM_Scope PNOMString NOMLINK impl_NOMString_assignCString(NOMString* nomSelf, const CORBA_char * chrString, CORBA_Environment *ev)
+/* Assign a C string to this NOMString. An initially created NOMString object is empty. */
+NOM_Scope PNOMString NOMLINK impl_NOMString_assignCString(NOMString* nomSelf, const CORBA_char * chrString,
+                                                          CORBA_Environment *ev)
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
 
-  g_string_assign(_gString, chrString);
+  g_string_assign(_gString, chrString); /* This copies the input string */
   return nomSelf;
 }
 
-/* Returns the C string held by this NOMString */
-NOM_Scope CORBA_string NOMLINK impl_NOMString_getCString(NOMString* nomSelf, CORBA_Environment *ev)
+/* Returns the C string held by this NOMString. */
+NOM_Scope CORBA_string NOMLINK impl_NOMString_queryCString(NOMString* nomSelf, CORBA_Environment *ev)
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
@@ -70 +72 @@
 }
 
+/* Returns a copy of the C string held by this NOMString. */
+NOM_Scope CORBA_string NOMLINK impl_NOMString_copyCString(NOMString* nomSelf, CORBA_Environment *ev)
+{
+  NOMStringData* nomThis=NOMStringGetData(nomSelf);
 
-NOM_Scope PNOMString NOMLINK impl_NOMString_appendString(NOMString* nomSelf, const PNOMString nomString, CORBA_Environment *ev)
+  return g_strdup(_gString->str);
+}
+
+NOM_Scope PNOMString NOMLINK impl_NOMString_appendCString(NOMString* nomSelf, const CORBA_char * chrString,
+                                                          CORBA_Environment *ev)
+{
+  NOMStringData* nomThis=NOMStringGetData(nomSelf);
+  PNOMString nomRetval=(PNOMString) NOMString_new(nomSelf, NULLHANDLE);
+  GString* gStrTmp;
+
+  gStrTmp=g_string_new(_gString->str);
+  g_string_append(gStrTmp, chrString);
+  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
+  g_string_free(gStrTmp, TRUE);
+
+  return nomRetval;
+}
+
+NOM_Scope PNOMString NOMLINK impl_NOMString_append(NOMString* nomSelf, const PNOMString nomString,
+                                                         CORBA_Environment *ev)
 {
   /*  NOMStringData* nomThis=NOMStringGetData(nomSelf); */
 
-  NOMString_appendCString(nomSelf, NOMString_getCString(nomString, NULLHANDLE), NULLHANDLE);
-  return nomSelf;
+  return NOMString_appendCString(nomSelf, NOMString_queryCString(nomString, NULLHANDLE), NULLHANDLE);
 }
 
-NOM_Scope PNOMString NOMLINK impl_NOMString_prependString(NOMString* nomSelf, const PNOMString nomString, CORBA_Environment *ev)
+NOM_Scope PNOMString NOMLINK impl_NOMString_prepend(NOMString* nomSelf, const PNOMString nomString,
+                                                          CORBA_Environment *ev)
 {
 /* NOMStringData* nomThis=NOMStringGetData(nomSelf); */
 
-  NOMString_prependCString(nomSelf, NOMString_getCString(nomString, NULLHANDLE), NULLHANDLE);
-  return nomSelf;
-}
-
-NOM_Scope PNOMString NOMLINK impl_NOMString_appendCString(NOMString* nomSelf, const CORBA_char * chrString, CORBA_Environment *ev)
-{
-  NOMStringData* nomThis=NOMStringGetData(nomSelf);
-
-  g_string_append(_gString, chrString);
-  return nomSelf;
+  return NOMString_prependCString(nomSelf, NOMString_queryCString(nomString, NULLHANDLE), NULLHANDLE);
 }
 
@@ -98 +114 @@
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
+  PNOMString nomRetval=(PNOMString)NOMString_new(nomSelf, NULLHANDLE);
+  GString* gStrTmp;
 
-  g_string_prepend(_gString, chrString);
+  gStrTmp=g_string_new(_gString->str);
+  g_string_prepend(gStrTmp, chrString);
+  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
+  g_string_free(gStrTmp, TRUE);
 
-  return nomSelf;
+  return nomRetval;
 }
 
@@ -111 +132 @@
 }
 
-NOM_Scope PNOMString NOMLINK impl_NOMString_truncateString(NOMString* nomSelf, const CORBA_unsigned_long ulNewLen,
+NOM_Scope PNOMString NOMLINK impl_NOMString_truncate(NOMString* nomSelf, const CORBA_unsigned_long ulNewLen,
                                                            CORBA_Environment *ev)
 {
   NOMStringData* nomThis=NOMStringGetData(nomSelf);
+  PNOMString nomRetval=(PNOMString)NOMString_new(nomSelf, NULLHANDLE);
+  GString* gStrTmp;
 
-  g_string_truncate(_gString, ulNewLen);
+  gStrTmp=g_string_new(_gString->str);
+  g_string_truncate(gStrTmp, ulNewLen);
+  NOMString_assignCString(nomRetval, gStrTmp->str, NULLHANDLE);
+  g_string_free(gStrTmp, TRUE);
 
-  return nomSelf;
+  return nomRetval;
 }
 
-NOM_Scope PNOMString NOMLINK impl_NOMString_copyString(NOMString* nomSelf, CORBA_Environment *ev)
+NOM_Scope PNOMString NOMLINK impl_NOMString_copy(NOMString* nomSelf, CORBA_Environment *ev)
 {
   /*  NOMStringData* nomThis=NOMStringGetData(nomSelf); */
-  PNOMString nomRetval=NOMStringNew();
+  PNOMString nomRetval;
+  NOMClass* nomCls;
 
-  NOMString_assignString(nomRetval, nomSelf, ev);
+  /* We don't know which class we're actually. So we can't just create a new NOMString here.
+     It is possible that we are called by a subclass. So get the class object and let the
+     class object create the correct class. */
+  nomCls=NOMObject_nomGetClass((PNOMObject) nomSelf, NULLHANDLE);
+  nomRetval=(PNOMString)NOMString_new(nomSelf, NULLHANDLE);
+
+  NOMString_assign(nomRetval, nomSelf, ev);
 
   return nomRetval;

trunk/foundation/idl/nomfilepath.idl

@@ -48 +48 @@
   PNOMPath appendSeparator();
   PNOMPath stripSeparator();
+  boolean  pathIsAbsolute();
+  PNOMPath queryRoot();
+  PNOMPath erasePathBegin();
+  PNOMPath queryPathBegin();
 };
 

trunk/foundation/idl/nomstring.idl

@@ -45 +45 @@
   NOMCLASSVERSION(1, 0);
 
-  PNOMString assignString(in PNOMString nomString);   
+  PNOMString assign(in PNOMString nomString);   
   /* Assign a C string to this NOMString */
   PNOMString assignCString(in string chrString);   
   /* Returns the C string held by this NOMString*/
-  string getCString();
-  PNOMString appendString(in PNOMString nomString);   
-  PNOMString prependString(in PNOMString nomString);
+  string queryCString();
+  PNOMString append(in PNOMString nomString);   
+  PNOMString prepend(in PNOMString nomString);
   PNOMString appendCString(in string chrString);   
   PNOMString prependCString(in string chrString);
   unsigned long length();
-  PNOMString truncateString(in unsigned long ulNewLen);
-  PNOMString copyString();
+  PNOMString truncate(in unsigned long ulNewLen);
+  PNOMString copy();
+  string copyCString();
 
   /* Init and uninit the GString */