Merge jv
authorHG Automerge
Tue, 17 Jan 2017 11:18:19 +0000
branchjv
changeset 4098 e535606a3be1
parent 4088 529963173d68 (current diff)
parent 4090 946442094574 (diff)
child 4099 030d35f3e782
Merge
ParserFlags.st
--- a/.hgtags	Thu Jan 12 09:44:22 2017 +0000
+++ b/.hgtags	Tue Jan 17 11:18:19 2017 +0000
@@ -7,7 +7,6 @@
 11eb7594d5df12f71bbb56b2ad3fd20238601d9a stable
 175735dcd732cb8ce1a54ad9d953842e5cd153b4 stable_expecco_sel
 1b4396f06cbffb2c8cc8168e6aabefde44d250ec expecco_2_6_0rc1
-25c54b8b50c6844a740e7b47e5290c4042722009 expecco_2_10_0
 346c1e0562318a0ae83b034d913f9138063db1ef rel2_10_8_6_last_before_vmData_change
 3d721bb07c485e8b0b52bd95893b3d883575619d expecco_2_4_0
 3d721bb07c485e8b0b52bd95893b3d883575619d expecco_2_4_1
@@ -60,6 +59,8 @@
 cb311d08a486aac5d2a58df4d08e1021dec39257 expecco_1_7_0rc3
 cb311d08a486aac5d2a58df4d08e1021dec39257 expecco_1_7_0rc5
 cc62390767a2277bee7fb57ac73be505b64388f4 expeccoNET_1_7_0_0
+ce26f968865ac21bfbf5f18fab5b8dd8eb26ca36 expecco_2_10_0
+ce26f968865ac21bfbf5f18fab5b8dd8eb26ca36 expecco_2_11_0
 cf71c91f5b7e3709e6050ba3130bd1d4dede134a expecco_2_7_1
 d628e2ef289e352e625d8a27c419fabb5b3f67c8 expecco_1_7_2rc1
 d69fc5970cd7ba0b81183f893a6c3fec2156fb62 rel5_1_4
--- a/ParserFlags.st	Thu Jan 12 09:44:22 2017 +0000
+++ b/ParserFlags.st	Tue Jan 17 11:18:19 2017 +0000
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
  COPYRIGHT (c) 2005 by eXept Software AG
@@ -457,8 +455,8 @@
     "Modified: / 16-09-2011 / 19:56:18 / cg"
 !
 
-stcKeepCIntermediate:something
-    STCKeepCIntermediate := something.
+stcKeepCIntermediate:aBoolean
+    STCKeepCIntermediate := aBoolean.
 
     "
      STCKeepCIntermediate := true.
@@ -474,8 +472,13 @@
     "Modified: / 16-09-2011 / 19:56:49 / cg"
 !
 
-stcKeepOIntermediate:something
-    STCKeepOIntermediate := something.
+stcKeepOIntermediate:aBoolean
+    STCKeepOIntermediate := aBoolean.
+
+    "
+     STCKeepOIntermediate := true.
+     STCKeepOIntermediate := false.
+    "
 !
 
 stcKeepSTIntermediate
@@ -489,8 +492,8 @@
     "Modified: / 16-09-2011 / 19:57:17 / cg"
 !
 
-stcKeepSTIntermediate:something
-    STCKeepSTIntermediate := something.
+stcKeepSTIntermediate:aBoolean
+    STCKeepSTIntermediate := aBoolean.
 
     "
      STCKeepSTIntermediate := true.
@@ -515,12 +518,12 @@
     ^ UserPreferences current workspaceDirectory  / 'modules'     
 !
 
-stcModulePath:something
+stcModulePath:aPath
     "set the path to the directory, where temporary modules are created.
      Obsolete now, as this should not be set from the outside,
      but instead rely totally on the userPreferences."
 
-    STCModulePath := something.
+    STCModulePath := aPath.
 !
 
 stcPath
@@ -917,7 +920,7 @@
 !
 
 allowParagraphInIdentifier
-    "return true, if §-characters are allowed in identifiers (treated as letter)"
+    "return true, if -characters are allowed in identifiers (treated as letter)"
 
     ^ AllowParagraphInIdentifier
 
@@ -925,7 +928,7 @@
 !
 
 allowParagraphInIdentifier:aBoolean
-    "this allows turning on/off §-characters in identifiers."
+    "this allows turning on/off -characters in identifiers."
 
     AllowParagraphInIdentifier := aBoolean.
 
@@ -1468,7 +1471,7 @@
 !
 
 warnParagraphInIdentifier
-    "return true, if §-characters in identifiers are to be warned about"
+    "return true, if -characters in identifiers are to be warned about"
 
     ^ Warnings and:[WarnParagraphInIdentifier]
 
@@ -1476,7 +1479,7 @@
 !
 
 warnParagraphInIdentifier:aBoolean
-    "this allows turning on/off warnings about §-characters in identifiers.
+    "this allows turning on/off warnings about -characters in identifiers.
      You may find those warnings useful, to make certain that your code
      is portable to other Smalltalk versions, which do not allow this"