Home My Page Projects Code Snippets Project Openings SML/NJ
Summary Activity Forums Tracker Lists Tasks Docs Surveys News SCM Files

SCM Repository

[smlnj] Diff of /sml/trunk/src/compiler/Parse/lex/tokentable.sml
ViewVC logotype

Diff of /sml/trunk/src/compiler/Parse/lex/tokentable.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 82, Sun May 3 00:00:24 1998 UTC revision 83, Wed May 6 22:23:51 1998 UTC
# Line 47  Line 47 
47              ("and"      , fn yypos => Tokens.AND(yypos,yypos+3)),              ("and"      , fn yypos => Tokens.AND(yypos,yypos+3)),
48              ("abstype"  , fn yypos => Tokens.ABSTYPE(yypos,yypos+7)),              ("abstype"  , fn yypos => Tokens.ABSTYPE(yypos,yypos+7)),
49              ("as"       , fn yypos => Tokens.AS(yypos,yypos+2)),              ("as"       , fn yypos => Tokens.AS(yypos,yypos+2)),
             ("assert"  , fn yypos => Tokens.ASSERT(yypos,yypos+6)),  
50              ("case"     , fn yypos => Tokens.CASE(yypos,yypos+4)),              ("case"     , fn yypos => Tokens.CASE(yypos,yypos+4)),
51              ("datatype" , fn yypos => Tokens.DATATYPE(yypos,yypos+8)),              ("datatype" , fn yypos => Tokens.DATATYPE(yypos,yypos+8)),
52              ("else"     , fn yypos => Tokens.ELSE(yypos,yypos+4)),              ("else"     , fn yypos => Tokens.ELSE(yypos,yypos+4)),
# Line 93  Line 92 
92    
93      val overloadHash = hashStr "overload"      val overloadHash = hashStr "overload"
94      val lazyHash = hashStr "lazy"      val lazyHash = hashStr "lazy"
     val assertHash = hashStr "assert"  
95    
96    (* look-up an identifier.  If the symbol is found, the corresponding token is    (* look-up an identifier.  If the symbol is found, the corresponding token is
97     * generated with the position of its begining. Otherwise it is a regular     * generated with the position of its begining. Otherwise it is a regular
# Line 112  Line 110 
110                else if ((not(!Control.Lazy.enabled))                else if ((not(!Control.Lazy.enabled))
111                andalso (hash = lazyHash) andalso (str = "lazy"))                andalso (hash = lazyHash) andalso (str = "lazy"))
112                  then mkId()                  then mkId()
               else if ((not(!SMLofNJ.Assert.enable))  
               andalso (hash = assertHash) andalso (str = "assert"))  
                 then mkId()  
113                  else tokFn yypos                  else tokFn yypos
114              end              end
115                handle NotToken => mkId()                handle NotToken => mkId()

Legend:
Removed from v.82  
changed lines
  Added in v.83

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0