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 78, Fri Apr 17 17:58:14 1998 UTC revision 79, Sat Apr 18 00:19:45 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)),
50                ("assert"  , fn yypos => Tokens.ASSERT(yypos,yypos+6)),
51              ("case"     , fn yypos => Tokens.CASE(yypos,yypos+4)),              ("case"     , fn yypos => Tokens.CASE(yypos,yypos+4)),
52              ("datatype" , fn yypos => Tokens.DATATYPE(yypos,yypos+8)),              ("datatype" , fn yypos => Tokens.DATATYPE(yypos,yypos+8)),
53              ("else"     , fn yypos => Tokens.ELSE(yypos,yypos+4)),              ("else"     , fn yypos => Tokens.ELSE(yypos,yypos+4)),
# Line 92  Line 93 
93    
94      val overloadHash = hashStr "overload"      val overloadHash = hashStr "overload"
95      val lazyHash = hashStr "lazy"      val lazyHash = hashStr "lazy"
96        val assertHash = hashStr "assert"
97    
98    (* 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
99     * 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 110  Line 112 
112                else if ((not(!Control.Lazy.enabled))                else if ((not(!Control.Lazy.enabled))
113                andalso (hash = lazyHash) andalso (str = "lazy"))                andalso (hash = lazyHash) andalso (str = "lazy"))
114                  then mkId()                  then mkId()
115                  else if ((not(!SMLofNJ.Assert.enable))
116                  andalso (hash = assertHash) andalso (str = "assert"))
117                    then mkId()
118                  else tokFn yypos                  else tokFn yypos
119              end              end
120                handle NotToken => mkId()                handle NotToken => mkId()

Legend:
Removed from v.78  
changed lines
  Added in v.79

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