← Back to branch summary

~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150

« back to all changes in this revision

Viewing changes to clang/lib/Parse/Parser.cpp

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2013-05-27 15:01:57 UTC
  • mfrom: (0.10.1) (0.9.1) (0.8.1) (0.7.1) (0.6.1) (0.5.2)
  • Revision ID: package-import@ubuntu.com-20130527150157-tdkrsjpuvht7v0qx
Tags: 1:3.4~svn182733-1~exp1
http://bugs.debian.org/708677
* New snapshot release (3.4 release)
* Add a symlink of libLLVM-3.4.so.1 to usr/lib/llvm-3.4/lib/libLLVM-3.4.so
    to fix make the llvm-config-3.4 --libdir work (Closes: #708677)
  * Various packages rename to allow co installations:
    * libclang1 => libclang1-3.4
    * libclang1-dbg => libclang1-3.4-dbg
    * libclang-dev => libclang-3.4-dev
    * libclang-common-dev => libclang-common-3.4-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
clang/lib/Parse/Parser.cpp
102
102
    OpenMPHandler.reset(new PragmaNoOpenMPHandler());
103
103
  PP.AddPragmaHandler(OpenMPHandler.get());
104
104
 
 
105
  if (getLangOpts().MicrosoftExt) {
 
106
    MSCommentHandler.reset(new PragmaCommentHandler(actions));
 
107
    PP.AddPragmaHandler(MSCommentHandler.get());
 
108
  }
 
109
 
105
110
  CommentSemaHandler.reset(new ActionCommentHandler(actions));
106
111
  PP.addCommentHandler(CommentSemaHandler.get());
107
112
 
436
441
  PP.RemovePragmaHandler(OpenMPHandler.get());
437
442
  OpenMPHandler.reset();
438
443
 
 
444
  if (getLangOpts().MicrosoftExt) {
 
445
    PP.RemovePragmaHandler(MSCommentHandler.get());
 
446
    MSCommentHandler.reset();
 
447
  }
 
448
 
439
449
  PP.RemovePragmaHandler("STDC", FPContractHandler.get());
440
450
  FPContractHandler.reset();
441
451
 
1874
1884
    
1875
1885
    break;
1876
1886
  } while (true);
1877
 
  
 
1887
 
 
1888
  if (PP.hadModuleLoaderFatalFailure()) {
 
1889
    // With a fatal failure in the module loader, we abort parsing.
 
1890
    cutOffParsing();
 
1891
    return DeclGroupPtrTy();
 
1892
  }
 
1893
 
1878
1894
  DeclResult Import = Actions.ActOnModuleImport(AtLoc, ImportLoc, Path);
1879
1895
  ExpectAndConsumeSemi(diag::err_module_expected_semi);
1880
1896
  if (Import.isInvalid())
1887
1903
  P.Diag(P.Tok, diag::err_bracket_depth_exceeded)
1888
1904
    << P.getLangOpts().BracketDepth;
1889
1905
  P.Diag(P.Tok, diag::note_bracket_depth);
1890
 
  P.SkipUntil(tok::eof);
 
1906
  P.SkipUntil(tok::eof, FinalToken);
1891
1907
  return true;  
1892
1908
}
1893
1909
 
1917
1933
  }
1918
1934
  P.Diag(P.Tok, DID);
1919
1935
  P.Diag(LOpen, diag::note_matching) << LHSName;
1920
 
  if (P.SkipUntil(Close, /*StopAtSemi*/ true, /*DontConsume*/ true))
 
1936
  if (P.SkipUntil(Close, FinalToken, /*StopAtSemi*/ true, /*DontConsume*/ true)
 
1937
      && P.Tok.is(Close))
1921
1938
    LClose = P.ConsumeAnyToken();
1922
1939
  return true;
1923
1940
}