mof 0.3.0 → 0.3.2

data/lib/mof/parser.rb

@@ -22,7 +22,7 @@ module MOF
 
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/mof/parser.y modeval..id77656aaeab', 'lib/mof/parser.y', 596
+module_eval <<'..end lib/mof/parser.y modeval..ide18a0f9dc8', 'lib/mof/parser.y', 583
 
 #
 # Initialize MOF::Parser
@@ -68,12 +68,14 @@ end
 	$stderr.puts "\t-d  debug"
 	$stderr.puts "\t-h  this help"
 	$stderr.puts "\t-I <dir>  include dir"
+	$stderr.puts "\t-f  force"
 	$stderr.puts "\t-n <namespace>"
 	$stderr.puts "\t-o <output>"
 	$stderr.puts "\t-s <style>  syntax style (wmi,cim)"
 	$stderr.puts "\t-q  quiet"
 	$stderr.puts "\t<moffiles>  file(s) to read (else use $stdin)"
 	exit 0
+      when "-f": options[:force] = true
       when "-s": options[:style] = argv.shift.to_sym
       when "-d": options[:debug] = true
       when "-q": options[:quiet] = true
@@ -99,7 +101,7 @@ end
 include Helper
 include Scanner
 
-..end lib/mof/parser.y modeval..id77656aaeab
+..end lib/mof/parser.y modeval..ide18a0f9dc8
 
 ##### racc 1.4.5 generates ###
 
@@ -124,340 +126,336 @@ racc_reduce_table = [
  1, 80, :_reduce_17,
  1, 80, :_reduce_none,
  9, 74, :_reduce_19,
- 0, 87, :_reduce_none,
+ 0, 87, :_reduce_20,
  2, 87, :_reduce_21,
  1, 88, :_reduce_none,
  1, 88, :_reduce_none,
  1, 88, :_reduce_none,
  0, 83, :_reduce_none,
- 1, 83, :_reduce_none,
+ 1, 83, :_reduce_26,
  4, 92, :_reduce_27,
  0, 94, :_reduce_28,
  3, 94, :_reduce_29,
  3, 93, :_reduce_30,
  0, 97, :_reduce_none,
  2, 97, :_reduce_32,
- 1, 98, :_reduce_33,
- 2, 98, :_reduce_34,
  0, 96, :_reduce_none,
  1, 96, :_reduce_none,
- 3, 100, :_reduce_37,
- 1, 100, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
- 1, 99, :_reduce_none,
+ 3, 99, :_reduce_35,
  1, 99, :_reduce_none,
- 1, 99, :_reduce_45,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_none,
+ 1, 98, :_reduce_43,
  0, 85, :_reduce_none,
  1, 85, :_reduce_none,
  0, 86, :_reduce_none,
  1, 86, :_reduce_none,
- 1, 84, :_reduce_50,
+ 1, 84, :_reduce_48,
+ 2, 102, :_reduce_49,
+ 2, 104, :_reduce_50,
  2, 103, :_reduce_51,
- 2, 105, :_reduce_52,
- 2, 104, :_reduce_53,
- 6, 89, :_reduce_54,
- 6, 91, :_reduce_55,
- 7, 90, :_reduce_56,
- 1, 107, :_reduce_none,
- 1, 107, :_reduce_58,
+ 6, 89, :_reduce_52,
+ 6, 91, :_reduce_53,
+ 7, 90, :_reduce_54,
+ 1, 106, :_reduce_none,
+ 1, 106, :_reduce_56,
+ 1, 110, :_reduce_none,
+ 1, 110, :_reduce_58,
  1, 111, :_reduce_none,
- 1, 111, :_reduce_60,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_none,
+ 1, 105, :_reduce_74,
+ 1, 109, :_reduce_75,
+ 2, 109, :_reduce_76,
+ 0, 112, :_reduce_none,
  1, 112, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_none,
- 1, 106, :_reduce_76,
- 1, 110, :_reduce_77,
- 2, 110, :_reduce_78,
- 0, 113, :_reduce_none,
- 1, 113, :_reduce_none,
- 2, 114, :_reduce_81,
- 0, 116, :_reduce_none,
- 3, 116, :_reduce_83,
- 5, 115, :_reduce_84,
- 1, 117, :_reduce_none,
+ 2, 113, :_reduce_79,
+ 0, 115, :_reduce_80,
+ 3, 115, :_reduce_81,
+ 5, 114, :_reduce_82,
+ 1, 116, :_reduce_none,
+ 1, 116, :_reduce_none,
  1, 117, :_reduce_none,
- 1, 118, :_reduce_none,
+ 0, 107, :_reduce_none,
+ 1, 107, :_reduce_none,
+ 0, 118, :_reduce_none,
+ 1, 118, :_reduce_89,
+ 3, 119, :_reduce_90,
+ 0, 121, :_reduce_91,
+ 1, 121, :_reduce_none,
  0, 108, :_reduce_none,
  1, 108, :_reduce_none,
- 0, 119, :_reduce_none,
- 1, 119, :_reduce_91,
- 3, 120, :_reduce_92,
- 0, 122, :_reduce_93,
+ 2, 120, :_reduce_95,
  1, 122, :_reduce_none,
- 0, 109, :_reduce_none,
- 1, 109, :_reduce_none,
- 2, 121, :_reduce_97,
- 1, 123, :_reduce_none,
- 1, 123, :_reduce_none,
- 1, 123, :_reduce_none,
- 3, 102, :_reduce_101,
- 0, 125, :_reduce_none,
- 1, 125, :_reduce_103,
- 3, 125, :_reduce_104,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_none,
- 1, 101, :_reduce_111,
+ 1, 122, :_reduce_none,
+ 1, 122, :_reduce_none,
+ 3, 101, :_reduce_99,
+ 0, 124, :_reduce_none,
+ 1, 124, :_reduce_101,
+ 3, 124, :_reduce_102,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_none,
+ 1, 100, :_reduce_109,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 82, :_reduce_none,
  1, 81, :_reduce_none,
- 2, 81, :_reduce_118,
- 1, 124, :_reduce_none,
- 1, 124, :_reduce_none,
+ 2, 81, :_reduce_116,
+ 1, 123, :_reduce_none,
+ 1, 123, :_reduce_none,
+ 2, 126, :_reduce_none,
+ 0, 127, :_reduce_none,
  2, 127, :_reduce_none,
- 0, 128, :_reduce_none,
- 2, 128, :_reduce_none,
- 1, 130, :_reduce_none,
- 3, 129, :_reduce_none,
- 2, 131, :_reduce_none,
- 0, 133, :_reduce_none,
- 3, 133, :_reduce_none,
+ 1, 129, :_reduce_none,
+ 3, 128, :_reduce_none,
+ 2, 130, :_reduce_none,
+ 0, 132, :_reduce_none,
  3, 132, :_reduce_none,
- 1, 134, :_reduce_none,
- 1, 134, :_reduce_none,
- 6, 75, :_reduce_132,
- 0, 137, :_reduce_none,
- 1, 137, :_reduce_none,
+ 3, 131, :_reduce_none,
+ 1, 133, :_reduce_none,
+ 1, 133, :_reduce_none,
+ 6, 75, :_reduce_130,
+ 0, 136, :_reduce_none,
+ 1, 136, :_reduce_none,
  1, 95, :_reduce_none,
  1, 95, :_reduce_none,
  1, 95, :_reduce_none,
  1, 95, :_reduce_none,
- 4, 135, :_reduce_139,
- 5, 136, :_reduce_140,
- 1, 139, :_reduce_141,
- 3, 139, :_reduce_142,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 1, 140, :_reduce_none,
- 5, 138, :_reduce_153,
- 1, 141, :_reduce_154,
- 3, 141, :_reduce_155,
+ 4, 134, :_reduce_137,
+ 5, 135, :_reduce_138,
+ 1, 138, :_reduce_139,
+ 3, 138, :_reduce_140,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 1, 139, :_reduce_none,
+ 5, 137, :_reduce_151,
+ 1, 140, :_reduce_152,
+ 3, 140, :_reduce_153,
  2, 76, :_reduce_none,
- 8, 126, :_reduce_none,
- 1, 142, :_reduce_none,
- 2, 142, :_reduce_none,
- 5, 143, :_reduce_none,
- 3, 143, :_reduce_161 ]
+ 8, 125, :_reduce_none,
+ 1, 141, :_reduce_none,
+ 2, 141, :_reduce_none,
+ 5, 142, :_reduce_none,
+ 3, 142, :_reduce_159 ]
 
-racc_reduce_n = 162
+racc_reduce_n = 160
 
-racc_shift_n = 237
+racc_shift_n = 235
 
 racc_action_table = [
-    16,   170,   149,   170,   165,   135,   165,    19,   162,   163,
-   154,    28,    29,   170,     8,   166,   165,   166,   160,     8,
-   164,   153,   155,   156,   157,    18,   149,   166,   125,   159,
-   115,   116,   117,   118,   119,   120,   121,   198,    35,   201,
-   165,    49,    51,    84,    87,    88,    89,    55,    56,    46,
-    47,   149,     1,   166,   178,    42,    10,     1,    10,    10,
-    41,    98,   127,    42,    10,    49,    51,    84,    87,    88,
-    89,    55,    56,    46,    47,    54,   187,   129,   -79,    42,
-   132,   186,    10,    10,    79,    98,    54,   184,   185,    80,
+    16,   168,   147,   168,   164,   134,   164,    19,   160,   161,
+   152,    28,    29,   168,     8,   165,   164,   165,   159,     8,
+   162,   151,   153,   154,   155,    18,   147,   165,   123,   158,
+   114,   115,   116,   117,   118,   119,   120,   200,   124,   197,
+   164,    49,    51,    84,    87,    88,    89,    55,    56,    46,
+    47,   147,     1,   165,   169,    42,    10,     1,    10,    10,
+    41,    98,    35,    42,    10,    49,    51,    84,    87,    88,
+    89,    55,    56,    46,    47,    54,   185,   126,   -77,    42,
+   127,   184,    10,    10,    79,    98,    54,   182,   183,    80,
     49,    51,    84,    87,    88,    89,    55,    56,    46,    47,
-    22,   133,    24,    20,    42,   134,    22,    10,    24,    20,
-    98,    35,   124,    23,    49,    51,   112,    18,   113,    23,
-    55,    56,    46,    47,    96,    49,    51,    35,   172,    10,
+    22,   131,    24,    20,    42,   132,    22,    10,    24,    20,
+    98,    35,   133,    23,    49,    51,   112,    18,   113,    23,
+    55,    56,    46,    47,    96,    49,    51,    35,   176,    10,
     10,    55,    56,    46,    47,    75,    62,    64,    66,    67,
-    68,    69,    70,    72,    73,    74,    76,    61,    63,    65,
-   -25,    75,    62,    64,    66,    67,    68,    69,    70,    72,
-    73,    74,    76,    61,    63,    65,    94,    95,    13,    14,
+    68,    69,    71,    72,    73,    74,    76,    61,    63,    65,
+   -25,    75,    62,    64,    66,    67,    68,    69,    71,    72,
+    73,    74,    76,    61,    63,    65,    13,    14,    94,    95,
     49,    51,    84,    87,    88,    89,    55,    56,    46,    47,
-   162,   163,   154,   193,   194,   111,    22,    10,    24,    20,
-   160,   151,   164,   153,   155,   156,   157,   152,   109,    23,
-   106,   159,    49,    51,    84,    87,    88,    89,    55,    56,
-    46,    47,   115,   116,   117,   118,   119,   120,   121,    10,
+   160,   161,   152,   191,   192,   111,    22,    10,    24,    20,
+   159,   149,   162,   151,   153,   154,   155,   150,   109,    23,
+   107,   158,    49,    51,    84,    87,    88,    89,    55,    56,
+    46,    47,   114,   115,   116,   117,   118,   119,   120,    10,
     49,    51,    84,    87,    88,    89,    55,    56,    46,    47,
-   115,   116,   117,   118,   119,   120,   121,    10,    75,    62,
-    64,    66,    67,    68,    69,    70,    72,    73,    74,    76,
-    61,    63,    65,   115,   116,   117,   118,   119,   120,   121,
-   104,   100,    35,   181,    98,    59,    96,    92,   191,   192,
-    78,    59,    35,    31,   199,    31,    36,    35,   207,   104,
-   209,   -61,   104,   212,   129,    33,   129,   219,    32,   221,
-   222,    31,   227,    15,   229,   230,   231,    10,   104,   129 ]
+   114,   115,   116,   117,   118,   119,   120,    10,    75,    62,
+    64,    66,    67,    68,    69,    71,    72,    73,    74,    76,
+    61,    63,    65,   104,   100,    35,   179,    98,    59,    96,
+    92,   189,   190,    78,    59,    35,    31,   198,    31,    36,
+    35,   205,   206,   104,   -59,   104,   209,    33,   127,   127,
+    32,   218,   219,    31,   224,   225,    15,   227,   228,   230,
+    10,   104,   127 ]
 
 racc_action_check = [
-     4,   139,   212,   192,   139,   109,   192,     5,   185,   185,
-   185,    13,    13,   219,     0,   139,   219,   192,   185,     4,
-   185,   185,   185,   185,   185,     5,   129,   219,    98,   185,
-    92,    92,    92,    92,    92,    92,    92,   188,   100,   190,
-   188,   212,   212,   212,   212,   212,   212,   212,   212,   212,
-   212,   186,     0,   190,   141,   212,   141,     4,   212,     0,
-    26,   212,   102,    26,     4,   129,   129,   129,   129,   129,
-   129,   129,   129,   129,   129,    95,   168,   103,   209,   129,
-   104,   168,   129,   209,    38,   129,    31,   158,   158,    38,
-   186,   186,   186,   186,   186,   186,   186,   186,   186,   186,
-    79,   106,    79,    79,   186,   107,    10,   186,    10,    10,
-   186,   177,    97,    79,    95,    95,    91,    86,    91,    10,
-    95,    95,    95,    95,    82,    31,    31,   217,   140,   124,
-   140,    31,    31,    31,    31,   177,   177,   177,   177,   177,
-   177,   177,   177,   177,   177,   177,   177,   177,   177,   177,
-    42,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-   217,   217,   217,   217,   217,   217,    48,    48,     1,     1,
+     4,   136,   209,   190,   136,   109,   190,     5,   134,   134,
+   134,    13,    13,   218,     0,   136,   218,   190,   134,     4,
+   134,   134,   134,   134,   134,     5,   184,   218,    97,   134,
+   150,   150,   150,   150,   150,   150,   150,   188,    98,   186,
+   188,   209,   209,   209,   209,   209,   209,   209,   209,   209,
+   209,   127,     0,   186,   137,   209,   137,     4,   209,     0,
+    26,   209,   100,    26,     4,   184,   184,   184,   184,   184,
+   184,   184,   184,   184,   184,    95,   166,   102,   206,   184,
+   103,   166,   184,   206,    38,   184,    31,   156,   156,    38,
+   127,   127,   127,   127,   127,   127,   127,   127,   127,   127,
+    10,   104,    10,    10,   127,   106,    79,   127,    79,    79,
+   127,   175,   107,    10,    95,    95,    91,    86,    91,    79,
+    95,    95,    95,    95,    83,    31,    31,   214,   139,   123,
+   139,    31,    31,    31,    31,   175,   175,   175,   175,   175,
+   175,   175,   175,   175,   175,   175,   175,   175,   175,   175,
+    42,   214,   214,   214,   214,   214,   214,   214,   214,   214,
+   214,   214,   214,   214,   214,   214,     1,     1,    48,    48,
     42,    42,    42,    42,    42,    42,    42,    42,    42,    42,
-   135,   135,   135,   183,   183,    81,     8,    42,     8,     8,
-   135,   131,   135,   135,   135,   135,   135,   133,    78,     8,
-    77,   135,    41,    41,    41,    41,    41,    41,    41,    41,
-    41,    41,   194,   194,   194,   194,   194,   194,   194,    41,
+   183,   183,   183,   180,   180,    81,     8,    42,     8,     8,
+   183,   130,   183,   183,   183,   183,   183,   133,    78,     8,
+    77,   183,    41,    41,    41,    41,    41,    41,    41,    41,
+    41,    41,   192,   192,   192,   192,   192,   192,   192,    41,
    112,   112,   112,   112,   112,   112,   112,   112,   112,   112,
-   152,   152,   152,   152,   152,   152,   152,   112,    36,    36,
+    92,    92,    92,    92,    92,    92,    92,   112,    36,    36,
     36,    36,    36,    36,    36,    36,    36,    36,    36,    36,
-    36,    36,    36,   122,   122,   122,   122,   122,   122,   122,
-    71,    60,   148,   150,    59,    57,    52,    43,   178,   179,
-    37,    34,    33,    28,   189,    27,    21,    19,   196,   197,
-   200,   201,   202,   204,   208,    18,   210,   211,    16,   213,
-   214,    14,   218,     3,   222,   223,   226,   230,   232,   234 ]
+    36,    36,    36,    70,    60,   146,   148,    59,    57,    52,
+    43,   176,   177,    37,    34,    33,    28,   187,    27,    21,
+    19,   194,   195,   196,   197,   199,   201,    18,   207,   208,
+    16,   210,   211,    14,   215,   216,     2,   219,   220,   222,
+   228,   229,   232 ]
 
 racc_action_pointer = [
-    -5,   162,   nil,   230,     0,    -2,   nil,   nil,   178,   nil,
-    98,   nil,   nil,     4,   233,   nil,   288,   nil,   254,   269,
-   nil,   210,   nil,   nil,   nil,   nil,     2,   217,   215,   nil,
-   nil,    78,   nil,   264,   243,   nil,   206,   210,    24,   nil,
-   nil,   155,   123,   201,   nil,   nil,   nil,   nil,   107,   nil,
-   nil,   nil,   218,   nil,   nil,   nil,   nil,   237,   nil,   197,
-   195,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   196,   nil,   nil,   nil,   nil,   nil,   140,   178,    92,
-   nil,   126,    76,   nil,   nil,   nil,    90,   nil,   nil,   nil,
-   nil,    56,    18,   nil,   nil,    67,   nil,    51,    20,   nil,
-    30,   nil,     1,     9,    33,   nil,    75,    42,   nil,   -53,
+    -5,   160,   223,   nil,     0,    -2,   nil,   nil,   178,   nil,
+    92,   nil,   nil,     4,   225,   nil,   280,   nil,   246,   262,
+   nil,   203,   nil,   nil,   nil,   nil,     2,   210,   208,   nil,
+   nil,    78,   nil,   257,   236,   nil,   206,   203,    24,   nil,
+   nil,   155,   123,   194,   nil,   nil,   nil,   nil,   109,   nil,
+   nil,   nil,   211,   nil,   nil,   nil,   nil,   230,   nil,   190,
+   188,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   189,   nil,   nil,   nil,   nil,   nil,   nil,   140,   178,    98,
+   nil,   126,   nil,    76,   nil,   nil,    90,   nil,   nil,   nil,
+   nil,    56,   218,   nil,   nil,    67,   nil,   -33,    30,   nil,
+    54,   nil,    16,    12,    54,   nil,    42,    86,   nil,   -53,
    nil,   nil,   173,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   241,   nil,    65,   nil,   nil,   nil,   nil,    18,
-   nil,   126,   nil,   139,   nil,   171,   nil,   nil,   nil,    -7,
-    66,    -8,   nil,   nil,   nil,   nil,   nil,   nil,   254,   nil,
-   197,   nil,   218,   nil,   nil,   nil,   nil,   nil,    28,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   103,   205,   200,
-   nil,   nil,   nil,   124,   nil,    -1,    43,   nil,    29,   245,
-    31,   nil,    -5,   nil,   200,   nil,   215,   215,   nil,   nil,
-   222,   223,   218,   nil,   215,   nil,   nil,   nil,   216,    19,
-   218,   227,    -6,   226,   231,   nil,   nil,   119,   229,     5,
-   nil,   nil,   231,   235,   nil,   nil,   288,   nil,   nil,   nil,
-   233,   nil,   234,   nil,   231,   nil,   nil ]
+   nil,   nil,   nil,    65,   nil,   nil,   nil,    43,   nil,   nil,
+   126,   nil,   nil,   139,    -1,   nil,    -7,    -8,   nil,    66,
+   nil,   nil,   nil,   nil,   nil,   nil,   247,   nil,   190,   nil,
+    18,   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   103,   198,   193,   nil,   nil,
+   124,   nil,   nil,   171,    18,   nil,    31,   238,    29,   nil,
+    -5,   nil,   200,   nil,   208,   214,   209,   216,   nil,   211,
+   nil,   208,   nil,   nil,   nil,   nil,    19,   210,   211,    -6,
+   221,   223,   nil,   nil,   119,   221,   222,   nil,     5,   224,
+   228,   nil,   281,   nil,   nil,   nil,   nil,   nil,   226,   227,
+   nil,   nil,   224,   nil,   nil ]
 
 racc_action_default = [
-    -1,  -162,   -26,  -162,   -25,  -162,    -2,    -4,  -162,    -5,
-  -162,    -6,    -7,  -162,   -12,  -156,  -162,    -3,  -162,  -162,
-  -137,  -162,  -135,  -138,  -136,   -28,   -35,   -12,   -12,   -11,
-   -10,  -162,   237,  -162,   -46,   -50,  -162,  -162,  -162,   -36,
-   -38,   -25,  -102,   -31,    -9,    -8,  -114,  -116,  -162,  -115,
-   -14,  -117,   -16,   -17,   -18,  -112,  -113,   -46,   -47,  -162,
-   -48,   -73,   -62,   -74,   -63,   -75,   -64,   -65,   -66,   -67,
-   -68,   -88,   -69,   -70,   -71,   -76,   -72,  -133,  -162,  -162,
-   -27,  -162,  -108,  -111,  -106,  -105,  -162,  -107,  -109,  -110,
-  -103,  -162,  -162,   -30,   -13,  -162,  -118,  -162,  -162,   -51,
-  -162,   -49,  -162,   -95,   -93,   -89,  -162,  -162,  -134,  -162,
-   -29,   -37,   -25,  -101,   -33,   -39,   -40,   -41,   -42,   -43,
-   -45,   -44,   -32,   -15,   -25,   -52,   -53,   -20,   -96,   -25,
-  -139,  -162,   -94,  -162,  -132,  -162,  -104,   -34,  -158,  -162,
-   -25,   -25,   -98,   -97,  -100,   -99,  -120,  -119,  -162,  -124,
-  -162,   -92,  -162,  -148,  -146,  -149,  -150,  -151,  -162,  -152,
-  -147,  -141,  -144,  -145,  -143,   -60,   -58,  -131,  -162,  -130,
-   -57,  -159,  -157,   -21,   -22,   -23,   -24,  -162,  -162,  -162,
-  -121,  -123,  -154,  -162,  -140,  -162,   -25,  -161,  -162,   -77,
-  -162,   -19,  -162,  -153,  -162,  -142,  -162,   -88,   -59,   -78,
-  -162,   -57,   -88,  -127,  -162,  -125,  -155,  -160,   -95,   -25,
-   -95,  -126,   -25,  -162,  -162,   -80,   -82,  -162,  -162,  -162,
-  -129,   -55,  -162,   -81,   -86,   -85,  -162,   -54,  -128,   -56,
-   -25,   -87,   -88,   -83,   -90,   -91,   -84 ]
+    -1,  -160,  -160,   -26,   -25,  -160,    -2,    -4,  -160,    -5,
+  -160,    -6,    -7,  -160,   -12,  -154,  -160,    -3,  -160,  -160,
+  -135,  -160,  -133,  -136,  -134,   -28,   -33,   -12,   -12,   -11,
+   -10,  -160,   235,  -160,   -44,   -48,  -160,  -160,  -160,   -34,
+   -36,   -25,  -100,   -31,    -9,    -8,  -112,  -114,  -160,  -113,
+   -14,  -115,   -16,   -17,   -18,  -110,  -111,   -44,   -45,  -160,
+   -46,   -71,   -60,   -72,   -61,   -73,   -62,   -63,   -64,   -65,
+   -86,   -66,   -67,   -68,   -69,   -74,   -70,  -131,  -160,  -160,
+   -27,  -160,  -109,  -106,  -104,  -103,  -160,  -105,  -107,  -108,
+  -101,  -160,  -160,   -30,   -13,  -160,  -116,  -160,  -160,   -49,
+  -160,   -47,  -160,   -93,   -91,   -87,  -160,  -160,  -132,  -160,
+   -29,   -35,   -25,   -99,   -37,   -38,   -39,   -40,   -41,   -43,
+   -42,   -32,   -15,   -25,   -50,   -51,   -20,   -25,  -137,   -94,
+  -160,   -92,  -130,  -160,  -160,  -102,  -160,   -25,  -156,   -25,
+   -96,   -95,   -98,   -97,  -118,  -117,  -160,  -122,  -160,   -90,
+  -160,  -146,  -144,  -147,  -148,  -149,  -160,  -139,  -150,  -145,
+  -142,  -143,  -141,  -129,   -58,   -56,  -160,  -128,   -55,  -155,
+  -157,   -21,   -22,   -23,   -24,  -160,  -160,  -160,  -119,  -121,
+  -160,  -152,  -138,  -160,   -25,  -159,  -160,   -75,  -160,   -19,
+  -160,  -151,  -160,  -140,  -160,  -160,   -86,   -55,   -76,   -86,
+   -57,  -160,  -123,  -125,  -153,  -158,   -25,   -93,   -93,   -25,
+  -124,  -160,   -78,   -80,  -160,  -160,  -160,  -127,  -160,  -160,
+   -79,   -83,  -160,   -84,   -52,   -53,  -126,   -54,   -25,   -86,
+   -85,   -81,   -88,   -82,   -89 ]
 
 racc_goto_table = [
-     5,    71,   103,    34,     5,   130,   114,   143,    81,    90,
-    52,    25,    50,    53,   188,   161,   203,    57,    60,   216,
-    30,   138,     6,     3,    91,   122,    17,     3,    43,    39,
-    21,    40,   101,    44,    45,    99,   137,   171,    38,   202,
-   233,    97,   176,   228,   175,   174,   197,   200,   214,   215,
-   173,   223,   226,   232,   224,   236,   235,   131,   141,    93,
-   102,   180,   205,    48,   196,   195,   182,   211,   168,    37,
-    77,   107,   108,   158,    52,    27,   123,    53,   183,   136,
-   110,   140,     4,   nil,   126,   nil,   nil,   nil,   nil,   nil,
-   220,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   206,   nil,
-   213,   nil,   218,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   139,   nil,   nil,   nil,   208,   nil,
-   nil,   nil,   179,   210,   nil,   nil,   nil,   nil,   nil,   nil,
-   139,   177,   190,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   234,   nil,   nil,   nil,   nil,   nil,   nil,
+     5,    70,   103,    34,     5,   128,   121,    25,   141,    81,
+    90,    52,   157,    50,    53,   188,   203,    57,    60,    30,
+   213,   138,     6,     2,    91,    43,    17,     2,    39,    21,
+    40,   101,    44,    45,    99,   170,    38,   196,   174,   173,
+   172,    97,   231,   199,   226,   195,   211,   212,   171,   220,
+   222,   229,   233,   234,   223,   130,   139,    93,   102,   178,
+   202,   193,    48,   210,   181,   194,   166,    37,    77,   106,
+   108,   156,    27,   180,   137,    52,   110,   122,    53,     4,
+   135,   nil,   nil,   nil,   125,   nil,   nil,   nil,   nil,   nil,
+   217,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   204,   nil,   nil,   215,
+   216,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   136,   nil,   nil,   nil,   nil,   207,   nil,
+   177,   208,   nil,   nil,   nil,   nil,   nil,   136,   nil,   175,
+   186,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   225,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   232,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   221,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   217,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   214,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   217 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   214 ]
 
 racc_goto_check = [
-    13,    36,    38,    14,    13,    39,    29,    53,    31,    31,
-    11,    23,    10,    12,    40,    70,    62,    14,    15,    45,
-     7,    73,     2,    56,    55,    28,     2,    56,    26,    30,
-    25,    32,    34,     7,     7,    35,    29,    73,    24,    37,
-    45,    15,    21,    62,    20,    19,    41,    42,    43,    44,
-    18,    46,    47,    48,    40,    49,    51,    52,    17,    27,
-    16,    59,    61,     9,    53,    70,    29,    63,    64,    65,
-    66,    67,    68,    69,    11,     8,    10,    12,    71,    31,
-    23,    72,     1,   nil,    14,   nil,   nil,   nil,   nil,   nil,
-    53,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    29,   nil,
-    39,   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,    38,   nil,
-   nil,   nil,    14,    38,   nil,   nil,   nil,   nil,   nil,   nil,
-    13,    13,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    38,   nil,   nil,   nil,   nil,   nil,   nil,
+    13,    35,    37,    14,    13,    38,    28,    23,    52,    30,
+    30,    11,    69,    10,    12,    39,    61,    14,    15,     7,
+    44,    72,     2,    55,    54,    26,     2,    55,    29,    25,
+    31,    33,     7,     7,    34,    72,    24,    36,    21,    20,
+    19,    15,    44,    40,    61,    41,    42,    43,    18,    45,
+    46,    47,    48,    50,    39,    51,    17,    27,    16,    58,
+    60,    69,     9,    62,    28,    52,    63,    64,    65,    66,
+    67,    68,     8,    70,    71,    11,    23,    10,    12,     1,
+    30,   nil,   nil,   nil,    14,   nil,   nil,   nil,   nil,   nil,
+    52,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    28,   nil,   nil,    38,
+    38,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    13,   nil,   nil,   nil,   nil,    37,   nil,
+    14,    37,   nil,   nil,   nil,   nil,   nil,    13,   nil,    13,
+    35,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    36,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    37,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    35,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    13,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-    13 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13 ]
 
 racc_goto_pointer = [
-   nil,    82,    22,   nil,   nil,   nil,   nil,     6,    62,    32,
-   -19,   -21,   -18,     0,   -16,   -16,     0,   -69,   -91,   -96,
-   -97,   -99,   nil,     1,    13,    22,     2,    16,   -67,   -86,
-     3,   -33,     5,   nil,   -28,   -24,   -35,  -151,   -69,   -98,
-  -163,  -142,  -143,  -161,  -160,  -190,  -165,  -165,  -173,  -179,
-   nil,  -178,   -47,  -122,   nil,   -18,    23,   nil,   nil,   -87,
-   nil,  -130,  -176,  -136,   -71,    48,    33,    -6,    -5,   -62,
-  -120,   -74,   -43,  -103 ]
+   nil,    79,    22,   nil,   nil,   nil,   nil,     5,    59,    31,
+   -18,   -20,   -17,     0,   -16,   -16,    -2,   -70,   -91,   -99,
+  -100,  -101,   nil,    -3,    11,    21,    -1,    14,   -86,     2,
+   -32,     4,   nil,   -29,   -25,   -35,  -149,   -68,   -98,  -160,
+  -145,  -141,  -160,  -159,  -186,  -164,  -164,  -171,  -180,   nil,
+  -179,   -49,  -119,   nil,   -18,    23,   nil,   nil,   -87,   nil,
+  -130,  -174,  -140,   -70,    46,    31,    -8,    -7,   -63,  -122,
+   -77,   -49,  -102 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     7,     9,    11,    12,   nil,   nil,   nil,
-   nil,    82,    85,    86,   189,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2,   nil,   nil,    26,   nil,   nil,   nil,   nil,
-   nil,   142,   145,    58,   nil,   146,   nil,   169,   nil,   nil,
-   nil,   167,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   105,   128,   nil,   nil,   144,   nil,    83,   147,   148,   nil,
-   150,   nil,   nil,   nil,   204,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil ]
+   nil,    83,    85,    86,   187,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     3,   nil,   nil,    26,   nil,   nil,   nil,   nil,
+   140,   143,    58,   nil,   144,   nil,   167,   nil,   nil,   nil,
+   163,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   105,
+   129,   nil,   nil,   142,   nil,    82,   145,   146,   nil,   148,
+   nil,   nil,   nil,   201,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil ]
 
 racc_token_table = {
  false => 0,
@@ -650,7 +648,6 @@ Racc_token_to_s_table = [
 'qualifierName',
 'qualifierParameter_opt',
 'flavor_opt',
-'qflavors',
 'flavor',
 'qualifierParameter',
 'constantValue',
@@ -752,7 +749,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 57
 
 module_eval <<'.,.,', 'lib/mof/parser.y', 69
   def _reduce_8( val, _values, result )
- raise RbmofError.new(@name,@lineno,@line,"Missing filename after '#pragma include'") unless val[3]
+ raise MOF::Helper::Error.new(@name,@lineno,@line,"Missing filename after '#pragma include'") unless val[3]
 	    open val[3], :pragma
    result
   end
@@ -763,7 +760,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 69
 module_eval <<'.,.,', 'lib/mof/parser.y', 75
   def _reduce_10( val, _values, result )
  raise StyleError.new(@name,@lineno,@line,"Use '#pragma include' instead of '#include'") unless @style == :wmi
-	    raise RbmofError.new(@name,@lineno,@line,"Missing filename after '#include'") unless val[2]
+	    raise MOF::Helper::Error.new(@name,@lineno,@line,"Missing filename after '#include'") unless val[2]
 	    open val[2], :pragma
    result
   end
@@ -827,11 +824,16 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 129
   end
 .,.,
 
- # reduce 20 omitted
+module_eval <<'.,.,', 'lib/mof/parser.y', 134
+  def _reduce_20( val, _values, result )
+ result = []
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 135
+module_eval <<'.,.,', 'lib/mof/parser.y', 136
   def _reduce_21( val, _values, result )
- result = (val[0]||[]) << val[1]
+ result = val[0] << val[1]
    result
   end
 .,.,
@@ -844,9 +846,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 135
 
  # reduce 25 omitted
 
- # reduce 26 omitted
+module_eval <<'.,.,', 'lib/mof/parser.y', 149
+  def _reduce_26( val, _values, result )
+ result = CIM::QualifierSet.new val[0]
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 154
+module_eval <<'.,.,', 'lib/mof/parser.y', 155
   def _reduce_27( val, _values, result )
  result = val[2]
 	    result.unshift val[1] if val[1]
@@ -854,14 +861,14 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 154
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 159
+module_eval <<'.,.,', 'lib/mof/parser.y', 160
   def _reduce_28( val, _values, result )
- result = CIM::Qualifiers.new
+ result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 163
+module_eval <<'.,.,', 'lib/mof/parser.y', 164
   def _reduce_29( val, _values, result )
  result = val[0]
 	    result << val[2] if val[2]
@@ -869,7 +876,7 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 163
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 185
+module_eval <<'.,.,', 'lib/mof/parser.y', 186
   def _reduce_30( val, _values, result )
  # Get qualifier decl
 	    qualifier = case val[0]
@@ -879,9 +886,9 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 185
 	    else
 	      nil
 	    end
-	    raise RbmofError.new(@name,@lineno,@line,"'#{val[0]}' is not a valid qualifier") unless qualifier
+	    raise MOF::Helper::Error.new(@name,@lineno,@line,"'#{val[0]}' is not a valid qualifier") unless qualifier
 	    value = val[1]
-	    raise RbmofError.new(@name,@lineno,@line,"#{value.inspect} does not match qualifier type '#{qualifier.type}'") unless qualifier.type.matches?(value)||@style == :wmi
+	    raise MOF::Helper::Error.new(@name,@lineno,@line,"#{value.inspect} does not match qualifier type '#{qualifier.type}'") unless qualifier.type.matches?(value)||@style == :wmi
 	    # Don't propagate a boolean 'false'
 	    if qualifier.type == :bool && value == false
 	      result = nil
@@ -894,37 +901,27 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 185
 
  # reduce 31 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 191
+module_eval <<'.,.,', 'lib/mof/parser.y', 192
   def _reduce_32( val, _values, result )
- result = val[1]
+ result = CIM::QualifierFlavors.new val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 196
-  def _reduce_33( val, _values, result )
- result = [ val[0] ]
-   result
-  end
-.,.,
+ # reduce 33 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 198
-  def _reduce_34( val, _values, result )
- result = val[0] << val[1]
+ # reduce 34 omitted
+
+module_eval <<'.,.,', 'lib/mof/parser.y', 202
+  def _reduce_35( val, _values, result )
+ result = val[1]
    result
   end
 .,.,
 
- # reduce 35 omitted
-
  # reduce 36 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 208
-  def _reduce_37( val, _values, result )
- result = val[1]
-   result
-  end
-.,.,
+ # reduce 37 omitted
 
  # reduce 38 omitted
 
@@ -936,12 +933,8 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 208
 
  # reduce 42 omitted
 
- # reduce 43 omitted
-
- # reduce 44 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 219
-  def _reduce_45( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 213
+  def _reduce_43( val, _values, result )
  case val[0].to_sym
 	      when :amended, :toinstance
 	        raise StyleError.new(@name,@lineno,@line,"'#{val[0]}' is not a valid flavor") unless @style == :wmi
@@ -950,44 +943,44 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 219
   end
 .,.,
 
- # reduce 46 omitted
+ # reduce 44 omitted
 
- # reduce 47 omitted
+ # reduce 45 omitted
 
- # reduce 48 omitted
+ # reduce 46 omitted
 
- # reduce 49 omitted
+ # reduce 47 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 234
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 228
+  def _reduce_48( val, _values, result )
  raise ParseError.new("Class name must be prefixed by '<schema>_'") unless val[0].include?("_") || @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 239
-  def _reduce_51( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 233
+  def _reduce_49( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 244
-  def _reduce_52( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 238
+  def _reduce_50( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 249
-  def _reduce_53( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 243
+  def _reduce_51( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 261
-  def _reduce_54( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 255
+  def _reduce_52( val, _values, result )
  if val[3]
 	      type = CIM::Array.new val[3],val[1]
 	    else
@@ -998,8 +991,8 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 261
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 269
-  def _reduce_55( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 263
+  def _reduce_53( val, _values, result )
  if val[4]
 	      raise StyleError.new(@name,@lineno,@line,"Array not allowed in reference declaration") unless @style == :wmi
 	    end
@@ -1008,32 +1001,36 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 269
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 274
-  def _reduce_56( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 268
+  def _reduce_54( val, _values, result )
  result = CIM::Method.new(val[1],val[2],val[0],val[4])
    result
   end
 .,.,
 
- # reduce 57 omitted
+ # reduce 55 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 282
-  def _reduce_58( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 276
+  def _reduce_56( val, _values, result )
  # tmplprov.mof has 'string Property;'
 	    raise StyleError.new(@name,@lineno,@line,"Invalid keyword '#{val[0]}' used for property name") unless @style == :wmi
    result
   end
 .,.,
 
- # reduce 59 omitted
+ # reduce 57 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 288
-  def _reduce_60( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 282
+  def _reduce_58( val, _values, result )
  result = "Indication"
    result
   end
 .,.,
 
+ # reduce 59 omitted
+
+ # reduce 60 omitted
+
  # reduce 61 omitted
 
  # reduce 62 omitted
@@ -1060,19 +1057,15 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 288
 
  # reduce 73 omitted
 
- # reduce 74 omitted
-
- # reduce 75 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 311
-  def _reduce_76( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 305
+  def _reduce_74( val, _values, result )
  raise StyleError.new(@name,@lineno,@line,"'void' is not a valid datatype") unless @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 319
-  def _reduce_77( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 313
+  def _reduce_75( val, _values, result )
  # WMI uses class names as data types (without REF ?!)
 	    raise StyleError.new(@name,@lineno,@line,"Expected 'ref' keyword after classname '#{val[0]}'") unless @style == :wmi
 	    result = CIM::ReferenceType.new val[0]
@@ -1080,35 +1073,40 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 319
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 322
-  def _reduce_78( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 316
+  def _reduce_76( val, _values, result )
  result = CIM::ReferenceType.new val[0]
    result
   end
 .,.,
 
- # reduce 79 omitted
+ # reduce 77 omitted
 
- # reduce 80 omitted
+ # reduce 78 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 332
-  def _reduce_81( val, _values, result )
- result = (val[1]||[]).unshift val[0]
+module_eval <<'.,.,', 'lib/mof/parser.y', 326
+  def _reduce_79( val, _values, result )
+ result = val[1].unshift val[0]
    result
   end
 .,.,
 
- # reduce 82 omitted
+module_eval <<'.,.,', 'lib/mof/parser.y', 331
+  def _reduce_80( val, _values, result )
+ result = []
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 338
-  def _reduce_83( val, _values, result )
- result = (val[0]||[]) << val[2]
+module_eval <<'.,.,', 'lib/mof/parser.y', 333
+  def _reduce_81( val, _values, result )
+ result = val[0] << val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 349
-  def _reduce_84( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 344
+  def _reduce_82( val, _values, result )
  if val[3]
 	      type = CIM::Array.new val[3], val[1]
 	    else
@@ -1119,6 +1117,10 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 349
   end
 .,.,
 
+ # reduce 83 omitted
+
+ # reduce 84 omitted
+
  # reduce 85 omitted
 
  # reduce 86 omitted
@@ -1127,73 +1129,73 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 349
 
  # reduce 88 omitted
 
- # reduce 89 omitted
-
- # reduce 90 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 369
-  def _reduce_91( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 364
+  def _reduce_89( val, _values, result )
  raise "Default parameter value not allowed in syntax style '{@style}'" unless @style == :wmi
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 374
-  def _reduce_92( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 369
+  def _reduce_90( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 379
-  def _reduce_93( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 374
+  def _reduce_91( val, _values, result )
  result = -1
    result
   end
 .,.,
 
- # reduce 94 omitted
+ # reduce 92 omitted
 
- # reduce 95 omitted
+ # reduce 93 omitted
 
- # reduce 96 omitted
+ # reduce 94 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 390
-  def _reduce_97( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 385
+  def _reduce_95( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 98 omitted
+ # reduce 96 omitted
 
- # reduce 99 omitted
+ # reduce 97 omitted
 
- # reduce 100 omitted
+ # reduce 98 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 401
-  def _reduce_101( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 396
+  def _reduce_99( val, _values, result )
  result = val[1]
    result
   end
 .,.,
 
- # reduce 102 omitted
+ # reduce 100 omitted
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 407
-  def _reduce_103( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 402
+  def _reduce_101( val, _values, result )
  result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 409
-  def _reduce_104( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 404
+  def _reduce_102( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
+ # reduce 103 omitted
+
+ # reduce 104 omitted
+
  # reduce 105 omitted
 
  # reduce 106 omitted
@@ -1202,17 +1204,17 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 409
 
  # reduce 108 omitted
 
- # reduce 109 omitted
-
- # reduce 110 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 420
-  def _reduce_111( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 415
+  def _reduce_109( val, _values, result )
  raise "Instance as property value not allowed in syntax style '{@style}'" unless @style == :wmi
    result
   end
 .,.,
 
+ # reduce 110 omitted
+
+ # reduce 111 omitted
+
  # reduce 112 omitted
 
  # reduce 113 omitted
@@ -1221,17 +1223,17 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 420
 
  # reduce 115 omitted
 
- # reduce 116 omitted
-
- # reduce 117 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 434
-  def _reduce_118( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 429
+  def _reduce_116( val, _values, result )
  result = val[0] + val[1]
    result
   end
 .,.,
 
+ # reduce 117 omitted
+
+ # reduce 118 omitted
+
  # reduce 119 omitted
 
  # reduce 120 omitted
@@ -1254,24 +1256,17 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 434
 
  # reduce 129 omitted
 
- # reduce 130 omitted
-
- # reduce 131 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 497
-  def _reduce_132( val, _values, result )
- qname = val[1]
-	    if qname.is_a?(CIM::QualifierDeclaration)
-	      raise "Wrong default type for #{qname}" unless qname.type.matches?(val[2][0])
-	      raise "Wrong default value for #{qname}" unless qname.type.matches?(val[2][1])
-	      result = qname
-	    else
-	      result = CIM::QualifierDeclaration.new( val[1], val[2][0], val[2][1], val[3], val[4])
-	    end
+module_eval <<'.,.,', 'lib/mof/parser.y', 484
+  def _reduce_130( val, _values, result )
+ result = CIM::QualifierDeclaration.new( val[1], val[2][0], val[2][1], val[3], val[4])
    result
   end
 .,.,
 
+ # reduce 131 omitted
+
+ # reduce 132 omitted
+
  # reduce 133 omitted
 
  # reduce 134 omitted
@@ -1280,39 +1275,39 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 497
 
  # reduce 136 omitted
 
- # reduce 137 omitted
-
- # reduce 138 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 517
-  def _reduce_139( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 504
+  def _reduce_137( val, _values, result )
  type = val[2].nil? ? val[1] : CIM::Array.new(val[2],val[1])
 	    result = [ type, val[3] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 522
-  def _reduce_140( val, _values, result )
- result = val[3]
+module_eval <<'.,.,', 'lib/mof/parser.y', 509
+  def _reduce_138( val, _values, result )
+ result = CIM::QualifierScopes.new(val[3])
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 527
-  def _reduce_141( val, _values, result )
- result = CIM::QualifierScope.new(val[0])
+module_eval <<'.,.,', 'lib/mof/parser.y', 514
+  def _reduce_139( val, _values, result )
+ result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 529
-  def _reduce_142( val, _values, result )
- result = val[0] << CIM::QualifierScope.new(val[2])
+module_eval <<'.,.,', 'lib/mof/parser.y', 516
+  def _reduce_140( val, _values, result )
+ result = val[0] << val[2]
    result
   end
 .,.,
 
+ # reduce 141 omitted
+
+ # reduce 142 omitted
+
  # reduce 143 omitted
 
  # reduce 144 omitted
@@ -1329,43 +1324,39 @@ module_eval <<'.,.,', 'lib/mof/parser.y', 529
 
  # reduce 150 omitted
 
- # reduce 151 omitted
-
- # reduce 152 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 547
-  def _reduce_153( val, _values, result )
- result = val[3]
+module_eval <<'.,.,', 'lib/mof/parser.y', 534
+  def _reduce_151( val, _values, result )
+ result = CIM::QualifierFlavors.new val[3]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 552
-  def _reduce_154( val, _values, result )
- result = val[0]
+module_eval <<'.,.,', 'lib/mof/parser.y', 539
+  def _reduce_152( val, _values, result )
+ result = [ val[0] ]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/mof/parser.y', 554
-  def _reduce_155( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 541
+  def _reduce_153( val, _values, result )
  result = val[0] << val[2]
    result
   end
 .,.,
 
+ # reduce 154 omitted
+
+ # reduce 155 omitted
+
  # reduce 156 omitted
 
  # reduce 157 omitted
 
  # reduce 158 omitted
 
- # reduce 159 omitted
-
- # reduce 160 omitted
-
-module_eval <<'.,.,', 'lib/mof/parser.y', 578
-  def _reduce_161( val, _values, result )
+module_eval <<'.,.,', 'lib/mof/parser.y', 565
+  def _reduce_159( val, _values, result )
  raise "Instance property '#{val[1]} must have a value" unless @style == :wmi
    result
   end