gsm: Start using the gsmElementId pragma through out the code

1 files changed, 62 insertions, 38 deletions

diff --git a/GSM48.st b/GSM48.st
index 47a599b..c993376 100644
--- a/GSM48.st
+++ b/GSM48.st
@@ -482,13 +482,13 @@ GSM48IE subclass: GSM48MIdentity [
 
     <category: 'OsmoGSM'>
 
+    <gsmElementId: 23>
+
     GSM48MIdentity class >> miIMSI   [ <category: 'spec'> ^ 16r1 ]
     GSM48MIdentity class >> miIMEI   [ <category: 'spec'> ^ 16r2 ]
     GSM48MIdentity class >> miIMEISV [ <category: 'spec'> ^ 16r3 ]
     GSM48MIdentity class >> miTMSI   [ <category: 'sepc'> ^ 16r4 ]
 
-    GSM48MIdentity class >> elementId [ ^ 23 ]
-
     GSM48MIdentity class >> createDefault [
         <category: 'creation'>
         ^ (self new)
@@ -654,14 +654,13 @@ GSM48SimpleTag subclass: GSM48FollowOn [
     <comment: 'I represent the 10.5.3.7. A simple tag value'>
 
     <gsmIeMask: 16rFF>
+    <gsmElementId: 16rA1>
 
     GSM48FollowOn class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #follow; yourself
     ]
-
-    GSM48FollowOn class >> elementId [ ^ 16rA1 ]
 ]
 
 GSM48SimpleTag subclass: GSM48CTSPermission [
@@ -669,6 +668,7 @@ GSM48SimpleTag subclass: GSM48CTSPermission [
     <comment: 'I represent the 10.5.3.7. A simple tag value'>
 
     <gsmIeMask: 16rFF>
+    <gsmElementId: 16rA2>
 
     GSM48CTSPermission class >> asTLVDescription [
         <category: 'parsing'>
@@ -676,7 +676,6 @@ GSM48SimpleTag subclass: GSM48CTSPermission [
             instVarName: #cts; yourself
     ]
 
-    GSM48CTSPermission class >> elementId [ ^ 16rA2 ]
 ]
 
 GSM48SimpleData subclass: GSM48IdentityType [
@@ -709,25 +708,27 @@ GSM48SimpleData subclass: GSM48IdentityType [
 GSM48SimpleTag subclass: GSMRepeatInd [
     <category: 'OsmoGSM'>
 
+    <gsmElementId: 16rD0>
+
     GSMRepeatInd class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #repeatInd; yourself
     ]
 
-    GSMRepeatInd class >> elementId [ ^ 16rD0 ]
 ]
 
 GSM48SimpleTag subclass: GSMPriorityLevel [
     <category: 'OsmoGSM'>
 
+    <gsmElementId: 16r80>
+
     GSMPriorityLevel class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #prio; yourself
     ]
 
-    GSMPriorityLevel class >> elementId [ ^ 16r80 ]
 ]
 
 Object subclass: GSMBitField [
@@ -975,13 +976,14 @@ GSM48DataHolder subclass: GSMBearerCap [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.5'>
 
+    <gsmElementId: 16r04>
+
     GSMBearerCap class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #bearer; yourself
     ]
 
-    GSMBearerCap class >> elementId [ ^ 16r04 ]
     GSMBearerCap class >> validSizes [ ^ 1 to: 13 ]
 
     "GSM 04.08 Table 10.5.102. Strings depend on other attributes"
@@ -992,13 +994,14 @@ GSM48DataHolder subclass: GSMFacility [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.15'>
 
+    <gsmElementId: 16r1C>
+
     GSMFacility class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #facility; yourself
     ]
 
-    GSMFacility class >> elementId [ ^ 16r1C ]
     GSMFacility class >> validSizes [ ^ 1 to: 254 ]
 ]
 
@@ -1006,6 +1009,8 @@ GSM48DataHolder subclass: GSMProgress [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.21 Progress indicator'>
 
+    <gsmElementId: 16r1E>
+
     GSMProgress class [
         codingStandardMask                  [ <category: 'Coding standard'> ^ 2r11 ]
         codingStandardQ931                  [ <category: 'Coding standard'> ^ 2r00 ]
@@ -1039,7 +1044,6 @@ GSM48DataHolder subclass: GSMProgress [
                 yourself
     ]
 
-    GSMProgress class >> elementId [ ^ 16r1E ]
     GSMProgress class >> validSizes [ ^ 2 to: 2 ]
 
     isGSMToPLMNS [
@@ -1091,13 +1095,14 @@ GSM48SimpleData subclass: GSMSignal [
     | signal |
     <category: 'OsmoGSM'>
 
+    <gsmElementId: 16r34>
+
     GSMSignal class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #signal; yourself
     ]
 
-    GSMSignal class >> elementId [ ^ 16r34 ]
     GSMSignal class >> length [ ^ 1 ]
 ]
 
@@ -1224,13 +1229,14 @@ GSM48DataHolder subclass: GSMCalledBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.7'>
 
+    <gsmElementId: 16r5E>
+
     GSMCalledBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #called; yourself
     ]
 
-    GSMCalledBCDNumber class >> elementId [ ^ 16r5E ]
     GSMCalledBCDNumber class >> validSizes [ 
         "For PCS1900 it is 19 in total, in theory up to 43. It
          depends on the direction as well"
@@ -1286,13 +1292,14 @@ GSM48DataHolder subclass: GSMCalledSubBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.8'>
 
+    <gsmElementId: 16r6D>
+
     GSMCalledSubBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #calledSub; yourself
     ]
 
-    GSMCalledSubBCDNumber class >> elementId [ ^ 16r6D ]
     GSMCalledSubBCDNumber class >> validSizes [ ^ 0 to: 21 ]
 ]
 
@@ -1300,13 +1307,14 @@ GSM48DataHolder subclass: GSMCallingBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.9'>
 
+    <gsmElementId: 16r5C>
+
     GSMCallingBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #calling; yourself
     ]
 
-    GSMCallingBCDNumber class >> elementId [ ^ 16r5C ]
     GSMCallingBCDNumber class >> validSizes [ ^ 1 to: 12 ]
 ]
 
@@ -1314,13 +1322,14 @@ GSM48DataHolder subclass: GSMCallingSubBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.10'>
 
+    <gsmElementId: 16r5D>
+
     GSMCallingSubBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #callingSub; yourself
     ]
 
-    GSMCallingSubBCDNumber class >> elementId [ ^ 16r5D ]
     GSMCallingSubBCDNumber class >> validSizes [ ^ 0 to: 21 ]
 ]
 
@@ -1328,13 +1337,14 @@ GSM48DataHolder subclass: GSMRedirectingBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.21a'>
 
+    <gsmElementId: 16r74>
+
     GSMRedirectingBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #redirect; yourself
     ]
 
-    GSMRedirectingBCDNumber class >> elementId [ ^ 16r74 ]
     GSMRedirectingBCDNumber class >> validSizes [ ^ 1 to: 17 ]
 ]
 
@@ -1342,13 +1352,14 @@ GSM48DataHolder subclass: GSMRedirectingSubBCDNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.21b'>
 
+    <gsmElementId: 16r75>
+
     GSMRedirectingSubBCDNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #redirectSub; yourself
     ]
 
-    GSMRedirectingSubBCDNumber class >> elementId [ ^ 16r75 ]
     GSMRedirectingSubBCDNumber class >> validSizes [ ^ 1 to: 21 ]
 ]
 
@@ -1356,7 +1367,8 @@ GSM48DataHolder subclass: GSMLLCompability [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.18'>
 
-    GSMLLCompability class >> elementId [ ^ 16r7C ]
+    <gsmElementId: 16r7C>
+
     GSMLLCompability class >> validSizes [ ^ 0 to: 13 ]
 ]
 
@@ -1364,7 +1376,7 @@ GSM48DataHolder subclass: GSMHLCompability [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.16'>
 
-    GSMHLCompability class >> elementId [ ^ 16r7D ]
+    <gsmElementId: 16r7D>
     GSMHLCompability class >> validSizes [ ^ 0 to: 3 ]
 ]
 
@@ -1372,13 +1384,14 @@ GSM48DataHolder subclass: GSMUserUser [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.25'>
 
+    <gsmElementId: 16r7E>
+
     GSMUserUser class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #useruser; yourself
     ]
 
-    GSMUserUser class >> elementId [ ^ 16r7E ]
     GSMUserUser class >> validSizes [ ^ 1 to: 33 ]
 ]
 
@@ -1386,13 +1399,14 @@ GSM48DataHolder subclass: GSMSSVersionInd [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.24'>
 
+    <gsmElementId: 16r7F>
+
     GSMSSVersionInd class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #ssVersion; yourself
     ]
 
-    GSMSSVersionInd class >> elementId [ ^ 16r7F ]
     GSMSSVersionInd class >> validSizes [ ^ 0 to: 1 ]
 ]
 
@@ -1400,6 +1414,7 @@ GSM48SimpleTag subclass: GSMClirSuppression [
     <category: 'OsmoGSM'>
 
     <gsmIeMask: 16rFF>
+    <gsmElementId: 16rA1>
 
     GSMClirSuppression class >> asTLVDescription [
         <category: 'parsing'>
@@ -1407,34 +1422,33 @@ GSM48SimpleTag subclass: GSMClirSuppression [
             instVarName: #clirSuppr; yourself
     ]
 
-    GSMClirSuppression class >> elementId [ ^ 16rA1 ]
 ]
 
 GSM48SimpleTag subclass: GSMClirInvocation [
     <category: 'OsmoGSM'>
 
     <gsmIeMask: 16rFF>
+    <gsmElementId: 16rA2>
 
     GSMClirInvocation class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #clirInvoc; yourself
     ]
-
-    GSMClirInvocation class >> elementId [ ^ 16rA2 ]
 ]
 
 GSM48DataHolder subclass: GSMCCCapabilities [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.5a'>
 
+    <gsmElementId: 16r15>
+
     GSMCCCapabilities class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #ccCapabil; yourself
     ]
 
-    GSMCCCapabilities class >> elementId [ ^ 16r15 ]
     GSMCCCapabilities class >> validSizes [ ^ 1 to: 2 ]
 
     "TODO: How to handle things that are specified like this but different in
@@ -1447,13 +1461,14 @@ GSM48DataHolder subclass: GSMConnectedNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.13'>
 
+    <gsmElementId: 16r4C>
+
     GSMConnectedNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #connected; yourself
     ]
 
-    GSMConnectedNumber class >> elementId [ ^ 16r4C ]
     GSMConnectedNumber class >> validSizes [ ^ 1 to: 12 ]
 ]
 
@@ -1461,13 +1476,14 @@ GSM48DataHolder subclass: GSMConnectedSubNumber [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.14'>
 
+    <gsmElementId: 16r4D>
+
     GSMConnectedSubNumber class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #connectedSub; yourself
     ]
 
-    GSMConnectedSubNumber class >> elementId [ ^ 16r4D ]
     GSMConnectedSubNumber class >> validSizes [ ^ 0 to: 21 ]
 ]
 
@@ -1475,13 +1491,14 @@ GSM48DataHolder subclass: GSMAllowedActions [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.27'>
 
+    <gsmElementId: 16r7B>
+
     GSMAllowedActions class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #allowedActions; yourself
     ]
 
-    GSMAllowedActions class >> elementId [ ^ 16r7B ]
     GSMAllowedActions class >> validSizes [ ^ 1 to: 1 ]
 ]
 
@@ -1489,12 +1506,13 @@ GSM48DataHolder subclass: GSM48Cause [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.11'>
 
+    <gsmElementId: 16r8>
+
     GSM48Cause class >> asTLVDescription [
         ^ super asTLVDescription
             instVarName: #cause; yourself.
     ]
 
-    GSM48Cause class >> elementId [ ^ 16r8 ]
     GSM48Cause class >> validSizes [ ^ 2 to: 30 ]
 ]
 
@@ -1502,13 +1520,14 @@ GSM48DataHolder subclass: GSMAlertingPattern [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.26'>
 
+    <gsmElementId: 16r19>
+
     GSMAlertingPattern class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #alert; yourself
     ]
 
-    GSMAlertingPattern class >> elementId [ ^ 16r19 ]
     GSMAlertingPattern class >> validSizes [ ^ 1 to: 1 ]
 ]
 
@@ -1529,13 +1548,14 @@ GSM48DataHolder subclass: GSM48AuxillaryStates [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.4'>
 
+    <gsmElementId: 16r24>
+
     GSM48AuxillaryStates class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #auxStates; yourself
     ]
 
-    GSM48AuxillaryStates class >> elementId [ <category: 'id'> ^ 16r24 ] 
     GSM48AuxillaryStates class >> validSizes [ <category: 'id'> ^ 1 to: 1]
 ]
 
@@ -1582,13 +1602,14 @@ GSM48SimpleData subclass: GSMStreamIdentifier [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.28'>
 
+    <gsmElementId: 16r19>
+
     GSMStreamIdentifier class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #streamIdentifier; yourself
     ]
 
-    GSMStreamIdentifier class >> elementId [ ^ 16r19 ]
     GSMStreamIdentifier class >> length [ ^ 1 ]
 ]
 
@@ -1596,13 +1617,14 @@ GSM48DataHolder subclass: GSMSupportedCodecs [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.32'>
 
+    <gsmElementId: 16r40>
+
     GSMSupportedCodecs class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #supportedCodecs; yourself
     ]
 
-    GSMSupportedCodecs class >> elementId [ ^ 16r40 ]
     GSMSupportedCodecs class >> validSizes [ ^ 3 to: 254 ]
 ]
 
@@ -1611,27 +1633,27 @@ GSM48SimpleTag subclass: GSMRedial [
     <comment: '10.5.4.34'>
 
     <gsmIeMask: 16rFF>
+    <gsmElementId: 16rA3>
 
     GSMRedial class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #redial; yourself
     ]
-
-    GSMRedial class >> elementId [ ^ 16rA3 ]
 ]
 
 GSM48SimpleData subclass: GSMNetworkCallControlCap [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.29'>
 
+    <gsmElementId: 16r2F>
+
     GSMNetworkCallControlCap class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #networkCallControlCaps; yourself
     ]
 
-    GSMNetworkCallControlCap class >> elementId [ ^ 16r2F ]
     GSMNetworkCallControlCap class >> length [ ^ 1 ]
 ]
 
@@ -1639,13 +1661,14 @@ GSM48SimpleData subclass: GSMCauseNoCLI [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.30'>
 
+    <gsmElementId: 16r3A>
+
     GSMCauseNoCLI class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #causeNoCLI; yourself
     ]
 
-    GSMCauseNoCLI class >> elementId [ ^ 16r3A ]
     GSMCauseNoCLI class >> length [ ^ 1 ]
 ]
 
@@ -1653,13 +1676,14 @@ GSM48DataHolder subclass: GSMBackupBearerCapability [
     <category: 'OsmoGSM'>
     <comment: '10.5.4.4a'>
 
+    <gsmElementId: 16r41>
+
     GSMBackupBearerCapability class >> asTLVDescription [
         <category: 'parsing'>
         ^ super asTLVDescription
             instVarName: #backupBearerCap; yourself
     ]
 
-    GSMBackupBearerCapability class >> elementId [ ^ 16r41 ]
     GSMBackupBearerCapability class >> validSizes [ ^ 1 to: 13 ]
 ]