Merge pull request #3842 from ghalliday/issue8544

HPCC-8544 Remove deprecated syntax DATASET <expression>

Reviewed-By: Richard Chapman <rchapan@hpccsystems.com>

ecl/hql/hqlgram.y

@@ -4233,22 +4233,12 @@ fieldDef
                             IHqlExpression * value = $5.getExpr();
                             parser->addDatasetField($2, $2.getName(), LINK(value->queryRecord()), value, $3.getExpr());
                         }
-    | DATASET dataSet
-                        {
-                            parser->reportWarning(ERR_DEPRECATED, $1.pos, "DATASET <dataset> syntax is deprecated.  Use DATASET id := <dataset> instead");
-                            IHqlExpression *value = $2.getExpr();
-                            _ATOM name = parser->createFieldNameFromExpr(value);
-                            parser->addDatasetField($1, name, LINK(queryOriginalRecord(value)), value, NULL);
-                            $$.clear();
-                        }
     | UNKNOWN_ID optFieldAttrs ASSIGN dataSet
                         {
                             IHqlExpression * value = $4.getExpr();
                             parser->addDatasetField($1, $1.getName(), LINK(value->queryRecord()), value, $2.getExpr());
                             $$.clear();
                         }
-
-
     | DICTIONARY '(' recordDef ')' knownOrUnknownId optFieldAttrs
                         {
                             $$.clear($1);

ecl/regress/stream3.ecl

@@ -117,6 +117,6 @@ ENDC++;
 
 titles := dataset(['', 'Mr. ', 'Rev. '], { string title });
 
-output(table(titles, { title, ': ', dataset blockedNames(title), '\n' } ));
-output(table(titles, { title, ': ', dataset linkedNames(title) , '\n' } ));
-output(table(titles, { title, ': ', dataset streamedNames(title), '\n' } ));
+output(table(titles, { title, ': ', dataset blockedNames := blockedNames(title), '\n' } ));
+output(table(titles, { title, ': ', dataset linkedNames := linkedNames(title) , '\n' } ));
+output(table(titles, { title, ': ', dataset streamedNames := streamedNames(title), '\n' } ));

testing/ecl/cppdataset.ecl

@@ -146,6 +146,6 @@ output(normalize(titles, streamedNames(left.title), transform(right)));
 
 // Project
 
-output(table(titles, { title, ': ', dataset blockedNames(title), '\n' } ));
-output(table(titles, { title, ': ', dataset linkedNames(title) , '\n' } ));
-output(table(titles, { title, ': ', dataset streamedNames(title), '\n' } ));
+output(table(titles, { title, ': ', dataset blockedNames := blockedNames(title), '\n' } ));
+output(table(titles, { title, ': ', dataset linkedNames := linkedNames(title) , '\n' } ));
+output(table(titles, { title, ': ', dataset streamedNames := streamedNames(title), '\n' } ));

testing/ecl/library5.ecl

@@ -64,6 +64,6 @@ addressTable := dataset([
         {'Smith','Baby', 2}]}
     ], addressRecord);
     
-output(addressTable, { dataset filterDataset(ds, 'Halliday').matches });
-output(addressTable, { dataset filterDataset(ds, 'Halliday').others });
+output(addressTable, { dataset matches := filterDataset(ds, 'Halliday').matches });
+output(addressTable, { dataset others := filterDataset(ds, 'Halliday').others });