提交: f3a84d2203e0d164fe3148753c487420a15d7722 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• 修訂: f3a84d2203e0d164fe3148753c487420a15d7722 (tree)
• 時間: 2020-06-22 19:44:57
• 作者: Keith Marshall <keith@user...>
• Commiter: Keith Marshall

Log Message

Support options interpretation from an unborn options object.

Change Summary

• modified: ChangeLog
• modified: src/pkgopts.cpp
• modified: src/pkgopts.h

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
[phone]  Keith Marshall  <[e-mail]>
+
+	Support options interpretation from an unborn options object.
+
+	* src/pkgopts.h (pkgOpts::Test, pkgOpts::IsSet, pkgOpts::GetValue)
+	(pkgOpts::GetString, pkgOpts::SetFlags): Delegate then to static class
+	methods, with inline wrappers passing "this" pointer explicitly.
+
+	* src/pkgopts.cpp (pkgOpts::Test, pkgOpts::IsSet, pkgOpts::GetValue)
+	(pkgOpts::GetString, pkgOpts::SetFlags): Implement the static methods.
+	(pkgPreferenceEvaluator::PresetScriptHook) [! pkgOptions()]: Do not
+	evaluate pkgOptions()->IsSet(); assume that it would implicitly return
+	false, thus suppressing all dependent processing, including subsequent
+	evaluation of pkgOptions()->GetString().
+
 2020-06-21  Keith Marshall  <[e-mail]>
 
 	Declare functions as void when return value is immaterial.

--- a/src/pkgopts.cpp
+++ b/src/pkgopts.cpp
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2012, 2013, MinGW.org Project
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2012, 2013, 2020, MinGW.org Project
  *
  *
  * Implementation of XML interpreter for configuation of preferences.
@@ -231,7 +231,8 @@ void pkgPreferenceEvaluator::PresetScriptHook( int index, const char *key, ... )
    * and initialise associated environment variable hooks, such
    * that they override XML preference settings.
    */
-  if( pkgOptions()->IsSet( index ) && (key != NULL) && (*key != '\0') )
+  pkgOpts *options = pkgOptions();
+  if( options && options->IsSet( index ) && (key != NULL) && (*key != '\0') )
   {
     /* The indexed command line option has been specified, and
      * it is associated with a viable environment variable name;
@@ -241,7 +242,7 @@ void pkgPreferenceEvaluator::PresetScriptHook( int index, const char *key, ... )
     va_list argv;
     va_start( argv, key );
     const char *value = va_arg( argv, const char * );
-    const char *preset = pkgOptions()->GetString( index );
+    const char *preset = options->GetString( index );
     if( (value = SetOptions( SetName( value ), argv, preset )) != NULL )
     {
       /* ...initialise the environment variable accordingly,
@@ -378,4 +379,51 @@ void pkgXmlDocument::EstablishPreferences( const char *client )
   }
 }
 
+unsigned pkgOpts::IsSet( pkgOpts *ref, int index )
+{
+  return ref
+    ? ref->flags[OPTION_ASSIGNED_FLAGS].numeric & OPTION_ASSIGNED(index)
+    : 0;
+}
+
+unsigned pkgOpts::Test( pkgOpts *ref, unsigned mask, int index )
+{
+  /* Test the state of specified bits within
+   * a bit-mapped numeric data (flags) entry.
+   */
+  return ref ? ref->flags[index].numeric & mask : 0;
+}
+
+unsigned pkgOpts::GetValue( pkgOpts *ref, int index )
+{
+  /* Retrieve the value of a numeric data entry.
+   */
+  return ref ? ref->flags[index & 0xFFF].numeric : 0;
+}
+
+const char *pkgOpts::GetString( pkgOpts *ref, int index )
+{
+  /* Retrieve a pointer to a string data entry.
+   */
+  return ref ? ref->flags[index & 0xFFF].string : NULL;
+}
+
+void pkgOpts::SetFlags( pkgOpts *ref, unsigned value )
+{
+  /* This is a mask and store operation, to set a specified
+   * bit-field within the first pair of flags slots; it mimics
+   * the options setting operation performed in the CLI start-up
+   * code, where the input value represents a 12-bit flag code,
+   * packaged with a 12-bit combining mask, and an alignment
+   * shift count between 0 and 52, in 4-bit increments.
+   */
+  if( ref )
+  { unsigned shift;
+    if( (shift = (value & OPTION_SHIFT_MASK) >> 22) < 53 )
+    { *(uint64_t *)(ref->flags) &= ~((uint64_t)((value & 0xfff000) >> 12) << shift);
+      *(uint64_t *)(ref->flags) |= (uint64_t)(value) << shift;
+    }
+  }
+}
+
 /* $RCSfile$: end of file */

--- a/src/pkgopts.h
+++ b/src/pkgopts.h
@@ -1,11 +1,10 @@
-#ifndef PKGOPTS_H
 /*
  * pkgopts.h
  *
  * $Id$
  *
- * Written by Keith Marshall <[e-mail]>
- * Copyright (C) 2011, 2012, MinGW Project
+ * Written by Keith Marshall <[e-mail]>
+ * Copyright (C) 2011, 2012, 2020, MinGW Project
  *
  *
  * Public declarations of the data structures, values and functions
@@ -26,6 +25,7 @@
  * arising from the use of this software.
  *
  */
+#ifndef PKGOPTS_H
 #define PKGOPTS_H  1
 
 #include <stdint.h>		/* required for uint64_t typedef */
@@ -126,48 +126,20 @@ class pkgOpts : protected pkgopts
   /* A derived "convenience" class, associating a collection
    * of utility methods with the pkgopts structure.
    */
+  private:
+    static unsigned IsSet( pkgOpts *, int );
+    static unsigned GetValue( pkgOpts *, int );
+    static const char *GetString( pkgOpts *, int );
+    static unsigned Test( pkgOpts *, unsigned, int );
+    static void SetFlags( pkgOpts *, unsigned );
+
   public:
-    inline unsigned IsSet( int index )
-    {
-      return this
-	? flags[OPTION_ASSIGNED_FLAGS].numeric & OPTION_ASSIGNED(index)
-	: 0;
-    }
-    inline unsigned GetValue( int index )
-    {
-      /* Retrieve the value of a numeric data entry.
-       */
-      return this ? (flags[index & 0xFFF].numeric) : 0;
-    }
-    inline const char *GetString( int index )
-    {
-      /* Retrieve a pointer to a string data entry.
-       */
-      return this ? (flags[index & 0xFFF].string) : NULL;
-    }
+    inline unsigned IsSet( int index ){ return IsSet( this, index ); }
+    inline unsigned GetValue( int index ){ return GetValue( this, index ); }
+    inline const char *GetString( int index ){ return GetString( this, index ); }
+    inline void SetFlags( unsigned value ){ SetFlags( this, value ); }
     inline unsigned Test( unsigned mask, int index = OPTION_FLAGS )
-    {
-      /* Test the state of specified bits within
-       * a bit-mapped numeric data (flags) entry.
-       */
-      return this ? (flags[index].numeric & mask) : 0;
-    }
-    inline void SetFlags( unsigned value )
-    {
-      /* This is a mask and store operation, to set a specified
-       * bit-field within the first pair of flags slots; it mimics
-       * the options setting operation performed in the CLI start-up
-       * code, where the input value represents a 12-bit flag code,
-       * packaged with a 12-bit combining mask, and an alignment
-       * shift count between 0 and 52, in 4-bit increments.
-       */
-      unsigned shift;
-      if( (shift = (value & OPTION_SHIFT_MASK) >> 22) < 53 )
-      {
-	*(uint64_t *)(flags) &= ~((uint64_t)((value & 0xfff000) >> 12) << shift);
-	*(uint64_t *)(flags) |= (uint64_t)(value) << shift;
-      }
-    }
+    { return Test( this, mask, index ); }
 };
 
 /* Access modes for the following global options accessor function.